");
+ };
+ result = result buf
+ print result;
+}
Index: /applications/editors/josm/plugins/public_transport/resources/public_transport.html
===================================================================
--- /applications/editors/josm/plugins/public_transport/resources/public_transport.html (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/resources/public_transport.html (revision 34718)
@@ -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
+
+
+
+
+
+
+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).
+
+
+
+Open JOSM and select from menu Edit > Preferences, then there Plugins > Download list. Check public_transport in the list. Now restart JOSM.
+
+
+
+
+
+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.
+
+
+
+
+
+
+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 https://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.
+
+
+
+
+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.
+
+
+
+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:
+
+- If you map from waypoints, only the combo box Type of stops to add is relevant to you.
+- If you map with a tracklog and a stopwatch, also the text fields Time on your GPS device and Time on your stopwatch are relevant.
+- If you map with a tracklog only and want to use heuristics, every item in this dialogue window but the text field Time on your stopwatch is 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.
+
+
+
+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.
+
+
+
+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.
+
+
+
+
+
+
+
+
+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.
+
+
+
+
+
+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.
+
+
+
+
+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.
+
+
+
+
+
+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.
+
+
+
+
+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/public_transport/src/org/openstreetmap/josm/plugins/public_transport/AStarAlgorithm.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/AStarAlgorithm.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/AStarAlgorithm.java (revision 34718)
@@ -0,0 +1,121 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport;
+
+import java.util.Iterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.Vector;
+
+public abstract class AStarAlgorithm {
+ // The following abstract functions and subclasses must be overridden by a class using
+ // AStarAlgorithm.
+
+ public abstract static class Vertex implements Comparable {
+ @Override
+ public abstract int compareTo(Vertex v);
+ }
+
+ public abstract static class Edge {
+ public abstract Vertex getBegin();
+
+ public abstract Vertex getEnd();
+
+ public abstract double getLength();
+ }
+
+ public abstract Vector getNeighbors(Vertex vertex);
+
+ public abstract double estimateDistance(Vertex vertex);
+
+ // end of interface to override -------------------------------------------
+
+ public AStarAlgorithm(Vertex begin, Vertex end) {
+ this.begin = begin;
+ this.end = end;
+ openList = new TreeMap<>();
+ closedList = new TreeSet<>();
+ pathTail = new TreeMap<>();
+ }
+
+ public Vertex determineCurrentStart() {
+ Vertex minVertex = null;
+ double minDist = 0;
+ Iterator> iter = openList.entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ double distance = entry.getValue().doubleValue() + estimateDistance(entry.getKey());
+ if (minVertex == null || distance < minDist) {
+ minDist = distance;
+ minVertex = entry.getKey();
+ }
+ }
+ if (minVertex != null) {
+ System.out.print(openList.get(minVertex).doubleValue());
+ System.out.print("\t");
+ System.out.println(minDist);
+ }
+
+ return minVertex;
+ }
+
+ Vector shortestPath() {
+ // Travel through the network
+ Vertex currentStart = begin;
+ openList.put(currentStart, 0.0);
+ while (currentStart != null && !currentStart.equals(end)) {
+ double startDistance = openList.get(currentStart).doubleValue();
+
+ // Mark currentStart as visited.
+ openList.remove(currentStart);
+ closedList.add(currentStart);
+
+ Iterator neighbors = getNeighbors(currentStart).iterator();
+ while (neighbors.hasNext()) {
+ Edge edge = neighbors.next();
+
+ // Don't walk back.
+ if (closedList.contains(edge.getEnd()))
+ continue;
+
+ // Update entry in openList
+ Double knownDistance = openList.get(edge.getEnd());
+ double distance = startDistance + edge.getLength();
+
+ if (knownDistance == null || distance < knownDistance.doubleValue()) {
+ openList.put(edge.getEnd(), distance);
+ pathTail.put(edge.getEnd(), edge);
+ }
+ }
+
+ currentStart = determineCurrentStart();
+ }
+
+ if (currentStart == null)
+ return null;
+
+ // Reconstruct the found path
+ Vector backwards = new Vector<>();
+ Vertex currentEnd = end;
+ while (!currentEnd.equals(begin)) {
+ backwards.add(pathTail.get(currentEnd));
+ currentEnd = pathTail.get(currentEnd).getBegin();
+ }
+
+ Vector result = new Vector<>();
+ for (int i = backwards.size() - 1; i >= 0; --i) {
+ result.add(backwards.elementAt(i));
+ }
+ return result;
+ }
+
+ protected Vertex begin;
+
+ protected Vertex end;
+
+ private TreeSet closedList;
+
+ private TreeMap openList;
+
+ private TreeMap pathTail;
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportAStar.java (revision 34718)
@@ -0,0 +1,143 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport;
+
+import java.util.Iterator;
+import java.util.Objects;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.Vector;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.gui.MainApplication;
+
+public class PublicTransportAStar extends AStarAlgorithm {
+ public PublicTransportAStar(Node start, Node end) {
+ super(new NodeVertex(start), new NodeVertex(end));
+ }
+
+ public static class NodeVertex extends AStarAlgorithm.Vertex {
+ public NodeVertex(Node node) {
+ this.node = node;
+ }
+
+ @Override
+ public int compareTo(AStarAlgorithm.Vertex v) {
+ return this.node.compareTo(((NodeVertex) v).node);
+ }
+
+ @Override
+ public boolean equals(Object o) {
+ if (!(o instanceof NodeVertex))
+ return false;
+ return node.equals(((NodeVertex) o).node);
+ }
+
+ @Override
+ public int hashCode() {
+ return Objects.hashCode(node);
+ }
+
+ public Node node;
+ }
+
+ public static class PartialWayEdge extends AStarAlgorithm.Edge {
+ public PartialWayEdge(Way way, int beginIndex, int endIndex) {
+ this.way = way;
+ this.beginIndex = beginIndex;
+ this.endIndex = endIndex;
+ }
+
+ @Override
+ public AStarAlgorithm.Vertex getBegin() {
+ return new NodeVertex(way.getNode(beginIndex));
+ }
+
+ @Override
+ public AStarAlgorithm.Vertex getEnd() {
+ return new NodeVertex(way.getNode(endIndex));
+ }
+
+ @Override
+ public double getLength() {
+ int min = beginIndex;
+ int max = endIndex;
+ if (endIndex < beginIndex) {
+ min = endIndex;
+ max = beginIndex;
+ }
+
+ double totalDistance = 0;
+ for (int i = min; i < max; ++i) {
+ totalDistance += way.getNode(i).getCoor().greatCircleDistance(way.getNode(i + 1).getCoor());
+ }
+ return totalDistance;
+ }
+
+ public Way way;
+
+ public int beginIndex;
+
+ public int endIndex;
+ }
+
+ @Override
+ public Vector getNeighbors(AStarAlgorithm.Vertex vertex) {
+ if (waysPerNode == null) {
+ waysPerNode = new TreeMap<>();
+
+ Iterator iter = MainApplication.getLayerManager().getEditDataSet().getWays().iterator();
+ while (iter.hasNext()) {
+ Way way = iter.next();
+
+ // Only consider ways that are usable
+ if (!way.isUsable())
+ continue;
+
+ // Further tests whether the way is eligible.
+
+ for (int i = 0; i < way.getNodesCount(); ++i) {
+ if (waysPerNode.get(way.getNode(i)) == null)
+ waysPerNode.put(way.getNode(i), new TreeSet());
+ waysPerNode.get(way.getNode(i)).add(way);
+ }
+ }
+ }
+
+ NodeVertex nodeVertex = (NodeVertex) vertex;
+ System.out.println(nodeVertex.node.getUniqueId());
+
+ Vector result = new Vector<>();
+ // Determine all ways in which nodeVertex.node is contained.
+ Iterator iter = waysPerNode.get(nodeVertex.node).iterator();
+ while (iter.hasNext()) {
+ Way way = iter.next();
+
+ // Only consider ways that are usable
+ if (!way.isUsable())
+ continue;
+
+ // Further tests whether the way is eligible.
+
+ for (int i = 0; i < way.getNodesCount(); ++i) {
+ if (way.getNode(i).equals(nodeVertex.node)) {
+ if (i > 0)
+ result.add(new PartialWayEdge(way, i, i - 1));
+ if (i < way.getNodesCount() - 1)
+ result.add(new PartialWayEdge(way, i, i + 1));
+ }
+ }
+ }
+
+ return result;
+ }
+
+ TreeMap> waysPerNode = null;
+
+ @Override
+ public double estimateDistance(AStarAlgorithm.Vertex vertex) {
+ NodeVertex nodeVertex = (NodeVertex) vertex;
+ return ((NodeVertex) super.end).node.getCoor()
+ .greatCircleDistance(nodeVertex.node.getCoor());
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportPlugin.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportPlugin.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/PublicTransportPlugin.java (revision 34718)
@@ -0,0 +1,52 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.KeyEvent;
+
+import javax.swing.JMenu;
+import javax.swing.JMenuItem;
+
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.gui.MainMenu;
+import org.openstreetmap.josm.plugins.Plugin;
+import org.openstreetmap.josm.plugins.PluginInformation;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.actions.RoutePatternAction;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+
+public class PublicTransportPlugin extends Plugin {
+
+ static JMenu jMenu;
+
+ public PublicTransportPlugin(PluginInformation info) {
+ super(info);
+ refreshMenu();
+ }
+
+ public static void refreshMenu() {
+ MainMenu menu = MainApplication.getMenu();
+
+ if (jMenu == null)
+ jMenu = menu.addMenu("Public Transport", tr("Public Transport"), KeyEvent.VK_COMMA,
+ menu.getDefaultMenuPos(), "help");
+ else
+ jMenu.removeAll();
+
+ jMenu.addSeparator();
+ jMenu.add(new JMenuItem(new StopImporterAction()));
+ jMenu.add(new JMenuItem(new RoutePatternAction()));
+ jMenu.add(new JMenuItem(new GTFSImporterAction()));
+ 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);
+ }
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/TransText.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/TransText.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/TransText.java (revision 34718)
@@ -0,0 +1,17 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+public class TransText {
+ public String text;
+
+ public TransText(String t) {
+ text = t;
+ }
+
+ @Override
+ public String toString() {
+ return text == null ? "" : tr(text);
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/GTFSImporterAction.java (revision 34718)
@@ -0,0 +1,523 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+import java.nio.file.Files;
+import java.text.DecimalFormat;
+import java.text.Format;
+import java.util.Iterator;
+import java.util.Vector;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.DefaultListModel;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSAddCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSCatchCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSDeleteCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.GTFSJoinCommand;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.GTFSImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.tools.Logging;
+
+/**
+ * Create Stops from GTFS
+ */
+public class GTFSImporterAction extends JosmAction {
+ private static GTFSImporterDialog dialog = null;
+
+ private static DefaultListModel tracksListModel = null;
+
+ private static Vector data = null;
+
+ private static TrackReference currentTrack = null;
+
+ private static GTFSStopTableModel gtfsStopTM = null;
+
+ public boolean inEvent = false;
+
+ /**
+ * Constructs a new {@code GTFSImporterAction}.
+ */
+ public GTFSImporterAction() {
+ super(tr("Create Stops from GTFS ..."), null, tr("Create Stops from a GTFS file"), null,
+ false);
+ putValue("toolbar", "publictransport/gtfsimporter");
+ MainApplication.getToolbar().register(this);
+ }
+
+ public GTFSStopTableModel getGTFSStopTableModel() {
+ return gtfsStopTM;
+ }
+
+ public GTFSImporterDialog getDialog() {
+ return dialog;
+ }
+
+ public DefaultListModel getTracksListModel() {
+ if (tracksListModel == null)
+ tracksListModel = new DefaultListModel<>();
+ return tracksListModel;
+ }
+
+ public TrackReference getCurrentTrack() {
+ return currentTrack;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+
+ if (dialog == null)
+ dialog = new GTFSImporterDialog(this);
+
+ dialog.setVisible(true);
+
+ if (tr("Create Stops from GTFS ...").equals(event.getActionCommand())) {
+ String curDir = Config.getPref().get("lastDirectory");
+ if (curDir.isEmpty()) {
+ curDir = ".";
+ }
+ JFileChooser fc = new JFileChooser(new File(curDir));
+ fc.setDialogTitle(tr("Select GTFS file (stops.txt)"));
+ fc.setMultiSelectionEnabled(false);
+
+ int answer = fc.showOpenDialog(MainApplication.getMainFrame());
+ if (answer != JFileChooser.APPROVE_OPTION)
+ return;
+
+ if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir))
+ Config.getPref().put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath());
+
+ importData(fc.getSelectedFile());
+
+ refreshData();
+
+/* } else if ("stopImporter.settingsGPSTimeStart".equals(event.getActionCommand()))
+ {
+ if ((!inEvent) && (dialog.gpsTimeStartValid()) && (currentTrack != null))
+ UndoRedoHandler.getInstance().add(new TrackStoplistRelocateCommand(this));
+ }
+ else if ("stopImporter.settingsStopwatchStart".equals(event.getActionCommand()))
+ {
+ if ((!inEvent) && (dialog.stopwatchStartValid()) && (currentTrack != null))
+ UndoRedoHandler.getInstance().add(new TrackStoplistRelocateCommand(this));
+ }
+ else if ("stopImporter.settingsTimeWindow".equals(event.getActionCommand()))
+ {
+ if (currentTrack != null)
+ currentTrack.timeWindow = dialog.getTimeWindow();
+ }
+ else if ("stopImporter.settingsThreshold".equals(event.getActionCommand()))
+ {
+ if (currentTrack != null)
+ currentTrack.threshold = dialog.getThreshold();
+ }
+ else if ("stopImporter.settingsSuggestStops".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new TrackSuggestStopsCommand(this));
+ else if ("stopImporter.stoplistFind".equals(event.getActionCommand()))
+ findNodesInTable(dialog.getStoplistTable(), currentTrack.stoplistTM.getNodes());
+ else if ("stopImporter.stoplistShow".equals(event.getActionCommand()))
+ showNodesFromTable(dialog.getStoplistTable(), currentTrack.stoplistTM.getNodes());
+ else if ("stopImporter.stoplistMark".equals(event.getActionCommand()))
+ markNodesFromTable(dialog.getStoplistTable(), currentTrack.stoplistTM.getNodes());
+ else if ("stopImporter.stoplistDetach".equals(event.getActionCommand()))
+ {
+ UndoRedoHandler.getInstance().add(new TrackStoplistDetachCommand(this));
+ dialog.getStoplistTable().clearSelection();
+ */
+ } else if ("gtfsImporter.gtfsStopsAdd".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new GTFSAddCommand(this));
+ else if ("gtfsImporter.gtfsStopsDelete".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new GTFSDeleteCommand(this));
+ else if ("gtfsImporter.gtfsStopsCatch".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new GTFSCatchCommand(this));
+ else if ("gtfsImporter.gtfsStopsJoin".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new GTFSJoinCommand(this));
+ else if ("gtfsImporter.gtfsStopsFind".equals(event.getActionCommand()))
+ findNodesInTable(dialog.getGTFSStopTable(), gtfsStopTM.nodes);
+ else if ("gtfsImporter.gtfsStopsShow".equals(event.getActionCommand()))
+ showNodesFromTable(dialog.getGTFSStopTable(), gtfsStopTM.nodes);
+ else if ("gtfsImporter.gtfsStopsMark".equals(event.getActionCommand()))
+ markNodesFromTable(dialog.getGTFSStopTable(), gtfsStopTM.nodes);
+ }
+
+ private void importData(final File file) {
+ try (BufferedReader r = Files.newBufferedReader(file.toPath(), StandardCharsets.UTF_8)) {
+ if (data == null)
+ data = new Vector<>();
+ else
+ data.clear();
+
+ while (r.ready()) {
+ data.add(r.readLine());
+ }
+ } catch (FileNotFoundException e) {
+ Logging.error(e);
+ JOptionPane.showMessageDialog(null, tr("File \"{0}\" does not exist", file.getName()));
+ } catch (IOException e) {
+ Logging.error(e);
+ JOptionPane.showMessageDialog(null, tr("IOException \"{0}\" occurred", e.toString()));
+ }
+ }
+
+ private void refreshData() {
+ if (data != null) {
+ Vector existingStops = new Vector<>();
+
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ if (ds == null) {
+ JOptionPane.showMessageDialog(null,
+ tr("There exists no dataset. Try to download data from the server or open an OSM file."),
+ tr("No data found"), JOptionPane.ERROR_MESSAGE);
+
+ return;
+ } else {
+ Iterator iter = ds.getNodes().iterator();
+ while (iter.hasNext()) {
+ Node node = iter.next();
+ if ("bus_stop".equals(node.get("highway")))
+ existingStops.add(node);
+ }
+ }
+
+ Iterator iter = data.iterator();
+ if (iter.hasNext())
+ gtfsStopTM = new GTFSStopTableModel(this, iter.next());
+ else {
+ JOptionPane.showMessageDialog(null, tr("The GTFS file was empty."),
+ tr("No data found"), JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+
+ while (iter.hasNext()) {
+ String s = iter.next();
+ gtfsStopTM.addRow(s, existingStops);
+ }
+ dialog.setGTFSStopTableModel(gtfsStopTM);
+ } else {
+ JOptionPane.showMessageDialog(null, tr("The GTFS file was empty."), tr("No data found"),
+ JOptionPane.ERROR_MESSAGE);
+ }
+ }
+
+// public void tracksSelectionChanged(int selectedPos)
+// {
+// if (selectedPos >= 0)
+// {
+// currentTrack = ((TrackReference)tracksListModel.elementAt(selectedPos));
+// dialog.setTrackValid(true);
+//
+// //Prepare Settings
+// dialog.setSettings
+// (currentTrack.gpsSyncTime, currentTrack.stopwatchStart,
+// currentTrack.timeWindow, currentTrack.threshold);
+//
+// //Prepare Stoplist
+// dialog.setStoplistTableModel
+// (((TrackReference)tracksListModel.elementAt(selectedPos)).stoplistTM);
+// }
+// else
+// {
+// currentTrack = null;
+// dialog.setTrackValid(false);
+// }
+// }
+
+ public static Node createNode(LatLon latLon, String id, String name) {
+ Node node = new Node(latLon);
+ node.put("highway", "bus_stop");
+ node.put("stop_id", id);
+ node.put("name", name);
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ if (ds == null) {
+ JOptionPane.showMessageDialog(null,
+ tr("There exists no dataset."
+ + " Try to download data from the server or open an OSM file."),
+ tr("No data found"), JOptionPane.ERROR_MESSAGE);
+
+ return null;
+ }
+ ds.addPrimitive(node);
+ return node;
+ }
+
+ /**
+ * returns a collection of all selected lines or a collection of all lines otherwise
+ * @param table table
+ * @return all selected lines or a collection of all lines otherwise
+ */
+ public static Vector getConsideredLines(JTable table) {
+ int[] selectedLines = table.getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < table.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+ return consideredLines;
+ }
+
+ /**
+ * marks the table items whose nodes are marked on the map
+ * @param table table
+ * @param nodes nodes
+ */
+ public static void findNodesInTable(JTable table, Vector nodes) {
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ if (ds == null)
+ return;
+
+ table.clearSelection();
+
+ for (int i = 0; i < table.getRowCount(); ++i) {
+ if (nodes.elementAt(i) != null && ds.isSelected(nodes.elementAt(i)))
+ table.addRowSelectionInterval(i, i);
+ }
+ }
+
+ /**
+ * shows the nodes that correspond to the marked lines in the table.
+ * If no lines are marked in the table, show all nodes from the vector
+ * @param table table
+ * @param nodes nodes
+ */
+ public static void showNodesFromTable(JTable table, Vector nodes) {
+ BoundingXYVisitor box = new BoundingXYVisitor();
+ Vector consideredLines = getConsideredLines(table);
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ int j = consideredLines.elementAt(i);
+ if (nodes.elementAt(j) != null)
+ nodes.elementAt(j).accept((PrimitiveVisitor) box);
+ }
+ if (box.getBounds() == null)
+ return;
+ box.enlargeBoundingBox();
+ MainApplication.getMap().mapView.zoomTo(box);
+ }
+
+ /**
+ * marks the nodes that correspond to the marked lines in the table.
+ * If no lines are marked in the table, mark all nodes from the vector
+ * @param table table
+ * @param nodes nodes
+ */
+ public static void markNodesFromTable(JTable table, Vector nodes) {
+ OsmPrimitive[] osmp = {null};
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ ds.setSelected(osmp);
+ Vector consideredLines = getConsideredLines(table);
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ int j = consideredLines.elementAt(i);
+ if (nodes.elementAt(j) != null)
+ ds.addSelected(nodes.elementAt(j));
+ }
+ }
+
+ public static String timeOf(double t) {
+ t -= Math.floor(t / 24 / 60 / 60) * 24 * 60 * 60;
+
+ int hour = (int) Math.floor(t / 60 / 60);
+ t -= Math.floor(t / 60 / 60) * 60 * 60;
+ int minute = (int) Math.floor(t / 60);
+ t -= Math.floor(t / 60) * 60;
+ double second = t;
+
+ Format format = new DecimalFormat("00");
+ Format formatS = new DecimalFormat("00.###");
+ return format.format(hour) + ":" + format.format(minute) + ":" + formatS.format(second);
+ }
+
+ public Action getFocusAddAction() {
+ return new FocusAddAction();
+ }
+
+ private class FocusAddAction extends AbstractAction {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ UndoRedoHandler.getInstance().add(new GTFSAddCommand(GTFSImporterAction.this));
+ showNodesFromTable(dialog.getGTFSStopTable(), gtfsStopTM.nodes);
+ }
+ }
+
+/* public Action getFocusWaypointShelterAction(String shelter)
+ {
+ return new FocusWaypointShelterAction(shelter);
+ }
+
+ public Action getFocusWaypointDeleteAction()
+ {
+ return new AbstractAction()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ JTable table = dialog.getWaypointsTable();
+ int row = table.getEditingRow();
+ if (row < 0)
+ return;
+ table.clearSelection();
+ table.addRowSelectionInterval(row, row);
+/* UndoRedoHandler.getInstance().add
+ (new WaypointsDisableCommand(GTFSImporterAction.this));*
+ }
+ };
+ }
+
+ public Action getFocusTrackStoplistNameAction()
+ {
+ return new FocusTrackStoplistNameAction();
+ }
+
+ public Action getFocusTrackStoplistShelterAction(String shelter)
+ {
+ return new FocusTrackStoplistShelterAction(shelter);
+ }
+
+ public Action getFocusStoplistDeleteAction()
+ {
+ return new AbstractAction()
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ JTable table = dialog.getStoplistTable();
+ int row = table.getEditingRow();
+ if (row < 0)
+ return;
+ table.clearSelection();
+ table.addRowSelectionInterval(row, row);
+/* UndoRedoHandler.getInstance().add
+ (new TrackStoplistDeleteCommand(GTFSImporterAction.this));*
+ }
+ };
+ }
+
+ private class FocusWaypointNameAction extends AbstractAction
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ JTable table = dialog.getWaypointsTable();
+ showNodesFromTable(table, waypointTM.nodes);
+ markNodesFromTable(table, waypointTM.nodes);
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ waypointTM.inEvent = true;
+ if (table.getCellEditor() != null)
+ {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 1);
+ table.getCellEditor().getTableCellEditorComponent
+ (table, "", true, row, 1);
+ waypointTM.inEvent = false;
+ }
+ };
+
+ private class FocusWaypointShelterAction extends AbstractAction
+ {
+ private String defaultShelter = null;
+
+ public FocusWaypointShelterAction(String defaultShelter)
+ {
+ this.defaultShelter = defaultShelter;
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ JTable table = dialog.getWaypointsTable();
+ showNodesFromTable(table, waypointTM.nodes);
+ markNodesFromTable(table, waypointTM.nodes);
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ waypointTM.inEvent = true;
+ if (table.getCellEditor() != null)
+ {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 2);
+ waypointTM.inEvent = false;
+ table.getCellEditor().getTableCellEditorComponent
+ (table, defaultShelter, true, row, 2);
+ }
+ };
+
+ private class FocusTrackStoplistNameAction extends AbstractAction
+ {
+ public void actionPerformed(ActionEvent e)
+ {
+ JTable table = dialog.getStoplistTable();
+ showNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ markNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ currentTrack.inEvent = true;
+ if (table.getCellEditor() != null)
+ {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 1);
+ table.getCellEditor().getTableCellEditorComponent
+ (table, "", true, row, 1);
+ currentTrack.inEvent = false;
+ }
+ };
+
+ private class FocusTrackStoplistShelterAction extends AbstractAction
+ {
+ private String defaultShelter = null;
+
+ public FocusTrackStoplistShelterAction(String defaultShelter)
+ {
+ this.defaultShelter = defaultShelter;
+ }
+
+ public void actionPerformed(ActionEvent e)
+ {
+ JTable table = dialog.getStoplistTable();
+ showNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ markNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ currentTrack.inEvent = true;
+ if (table.getCellEditor() != null)
+ {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 2);
+ currentTrack.inEvent = false;
+ table.getCellEditor().getTableCellEditorComponent
+ (table, defaultShelter, true, row, 2);
+ }
+ };*/
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/RoutePatternAction.java (revision 34718)
@@ -0,0 +1,1978 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Frame;
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+import java.awt.event.ActionEvent;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.TreeMap;
+import java.util.TreeSet;
+import java.util.Vector;
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JCheckBox;
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JOptionPane;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTable;
+import javax.swing.JTextField;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.DefaultTableModel;
+import javax.swing.table.TableCellEditor;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.actions.mapmode.DeleteAction;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.Relation;
+import org.openstreetmap.josm.data.osm.RelationMember;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.models.ItineraryTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.RouteReference;
+import org.openstreetmap.josm.plugins.public_transport.refs.StopReference;
+
+public class RoutePatternAction extends JosmAction {
+
+ public static int STOPLIST_ROLE_COLUMN = 2;
+
+ private static class RoutesLSL implements ListSelectionListener {
+ RoutePatternAction root = null;
+
+ RoutesLSL(RoutePatternAction rpa) {
+ root = rpa;
+ }
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ root.routesSelectionChanged();
+ }
+ }
+
+ private static class TagTableModel extends DefaultTableModel implements TableModelListener {
+ Relation relation = null;
+
+ TreeSet blacklist = null;
+
+ boolean hasFixedKeys = true;
+
+ TagTableModel(boolean hasFixedKeys) {
+ this.hasFixedKeys = hasFixedKeys;
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ if (column == 0 && hasFixedKeys)
+ return false;
+ return true;
+ }
+
+ public void readRelation(Relation rel) {
+ relation = rel;
+
+ for (int i = 0; i < getRowCount(); ++i) {
+ String value = rel.get((String) getValueAt(i, 0));
+ if (value == null)
+ value = "";
+ setValueAt(value, i, 1);
+ }
+ }
+
+ public void readRelation(Relation rel, TreeSet blacklist) {
+ relation = rel;
+ this.blacklist = blacklist;
+
+ setRowCount(0);
+ Iterator> iter = rel.getKeys().entrySet().iterator();
+ while (iter.hasNext()) {
+ Map.Entry entry = iter.next();
+ if (!blacklist.contains(entry.getKey())) {
+ Vector newRow = new Vector<>();
+ newRow.add(entry.getKey());
+ newRow.add(entry.getValue());
+ addRow(newRow);
+ }
+ }
+
+ for (int i = 0; i < getRowCount(); ++i) {
+ String value = rel.get((String) getValueAt(i, 0));
+ if (value == null)
+ value = "";
+ setValueAt(value, i, 1);
+ }
+ }
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if (e.getType() == TableModelEvent.UPDATE) {
+ relation.setModified(true);
+
+ String key = (String) getValueAt(e.getFirstRow(), 0);
+ if (key == null)
+ return;
+ if (blacklist == null || !blacklist.contains(key)) {
+ relation.setModified(true);
+ if ("".equals(getValueAt(e.getFirstRow(), 1)))
+ relation.remove(key);
+ else
+ relation.put(key, (String) getValueAt(e.getFirstRow(), 1));
+ } else {
+ if (e.getColumn() == 0)
+ setValueAt("", e.getFirstRow(), 0);
+ }
+ }
+ }
+ }
+
+ private static class CustomCellEditorTable extends JTable {
+ TreeMap col1 = null;
+
+ TreeMap col2 = null;
+
+ CustomCellEditorTable() {
+ col1 = new TreeMap<>();
+ col2 = new TreeMap<>();
+ }
+
+ @Override
+ public TableCellEditor getCellEditor(int row, int column) {
+ TableCellEditor editor = null;
+ if (column == 0)
+ editor = col1.get(Integer.valueOf(row));
+ else
+ editor = col2.get(Integer.valueOf(row));
+ if (editor == null)
+ return new DefaultCellEditor(new JTextField());
+ else
+ return editor;
+ }
+
+ public void setCellEditor(int row, int column, TableCellEditor editor) {
+ if (column == 0)
+ col1.put(Integer.valueOf(row), editor);
+ else
+ col2.put(Integer.valueOf(row), editor);
+ }
+ }
+
+ private static class StoplistTableModel extends DefaultTableModel {
+
+ public Vector nodes = new Vector<>();
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ if (column != STOPLIST_ROLE_COLUMN)
+ return false;
+ return true;
+ }
+
+ @Override
+ public void addRow(Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void insertRow(int insPos, Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addRow(Node node, String role, double distance) {
+ insertRow(-1, node, role, distance);
+ }
+
+ public void insertRow(int insPos, Node node, String role, double distance) {
+ String[] buf = {"", "", "", ""};
+ String curName = node.get("name");
+ if (curName != null) {
+ buf[0] = curName;
+ } else {
+ buf[0] = tr("[ID] {0}", Long.valueOf(node.getId()).toString());
+ }
+ String curRef = node.get("ref");
+ if (curRef != null) {
+ buf[1] = curRef;
+ }
+ buf[STOPLIST_ROLE_COLUMN] = role;
+ buf[3] = Double.toString(((double) (int) (distance * 40000 / 360.0 * 100)) / 100);
+
+ if (insPos == -1) {
+ nodes.addElement(node);
+ super.addRow(buf);
+ } else {
+ nodes.insertElementAt(node, insPos);
+ super.insertRow(insPos, buf);
+ }
+ }
+
+ public void clear() {
+ nodes.clear();
+ super.setRowCount(0);
+ }
+ }
+
+ private class StoplistTableModelListener implements TableModelListener {
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if (e.getType() == TableModelEvent.UPDATE) {
+ rebuildNodes();
+ }
+ }
+ }
+
+ private static class SegmentMetric {
+ public double aLat, aLon;
+
+ public double length;
+
+ public double d1, d2, o1, o2;
+
+ public double distance;
+
+ SegmentMetric(double fromLat, double fromLon, double toLat, double toLon,
+ double distance) {
+ this.distance = distance;
+
+ aLat = fromLat;
+ aLon = fromLon;
+
+ // Compute length and direction
+ // length is in units of latitude degrees
+ d1 = toLat - fromLat;
+ d2 = (toLon - fromLon) * Math.cos(fromLat * Math.PI / 180.0);
+ length = Math.sqrt(d1 * d1 + d2 * d2);
+
+ // Normalise direction
+ d1 = d1 / length;
+ d2 = d2 / length;
+
+ // Compute orthogonal direction (right hand size is positive)
+ o1 = -d2;
+ o2 = d1;
+
+ // Prepare lon direction to reduce the number of necessary multiplications
+ d2 = d2 * Math.cos(fromLat * Math.PI / 180.0);
+ o2 = o2 * Math.cos(fromLat * Math.PI / 180.0);
+ }
+ }
+
+ private static JDialog jDialog = null;
+
+ private static JTabbedPane tabbedPane = null;
+
+ private static DefaultListModel relsListModel = null;
+
+ private static TagTableModel requiredTagsData = null;
+
+ private static CustomCellEditorTable requiredTagsTable = null;
+
+ private static TagTableModel commonTagsData = null;
+
+ private static CustomCellEditorTable commonTagsTable = null;
+
+ private static TagTableModel otherTagsData = null;
+
+ private static TreeSet tagBlacklist = null;
+
+ private static CustomCellEditorTable otherTagsTable = null;
+
+ private static ItineraryTableModel itineraryData = null;
+
+ private static JTable itineraryTable = null;
+
+ private static StoplistTableModel stoplistData = null;
+
+ private static JTable stoplistTable = null;
+
+ private static JList relsList = null;
+
+ private static JCheckBox cbRight = null;
+
+ private static JCheckBox cbLeft = null;
+
+ private static JTextField tfSuggestStopsLimit = null;
+
+ private static Relation currentRoute = null;
+
+ private static Vector segmentMetrics = null;
+
+ private static Vector markedWays = new Vector<>();
+
+ private static Vector markedNodes = new Vector<>();
+
+ public RoutePatternAction() {
+ super(tr("Route patterns ..."), null, tr("Edit Route patterns for public transport"), null,
+ false);
+ putValue("toolbar", "publictransport/routepattern");
+ MainApplication.getToolbar().register(this);
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ Frame frame = JOptionPane.getFrameForComponent(MainApplication.getMainFrame());
+ DataSet mainDataSet = MainApplication.getLayerManager().getEditDataSet();
+
+ if (jDialog == null) {
+ jDialog = new JDialog(frame, tr("Route Patterns"), false);
+ tabbedPane = new JTabbedPane();
+ JPanel tabOverview = new JPanel();
+ tabbedPane.addTab(tr("Overview"), tabOverview);
+ JPanel tabTags = new JPanel();
+ tabbedPane.addTab(tr("Tags"), tabTags);
+ JPanel tabItinerary = new JPanel();
+ tabbedPane.addTab(tr("Itinerary"), tabItinerary);
+ JPanel tabStoplist = new JPanel();
+ tabbedPane.addTab(tr("Stops"), tabStoplist);
+ JPanel tabMeta = new JPanel();
+ tabbedPane.addTab(tr("Meta"), tabMeta);
+ tabbedPane.setEnabledAt(0, true);
+ tabbedPane.setEnabledAt(1, false);
+ tabbedPane.setEnabledAt(2, false);
+ tabbedPane.setEnabledAt(3, false);
+ tabbedPane.setEnabledAt(4, false);
+ jDialog.add(tabbedPane);
+
+ // Overview Tab
+ Container contentPane = tabOverview;
+ GridBagLayout gridbag = new GridBagLayout();
+ GridBagConstraints layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ JLabel headline = new JLabel(tr("Existing route patterns:"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(headline, layoutCons);
+ contentPane.add(headline);
+
+ relsListModel = new DefaultListModel<>();
+ relsList = new JList<>(relsListModel);
+ JScrollPane rpListSP = new JScrollPane(relsList);
+ String[] data = {"1", "2", "3", "4", "5", "6"};
+ relsListModel.copyInto(data);
+ relsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ relsList.addListSelectionListener(new RoutesLSL(this));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(rpListSP, layoutCons);
+ contentPane.add(rpListSP);
+
+ JButton bRefresh = new JButton(tr("Refresh"));
+ bRefresh.setActionCommand("routePattern.refresh");
+ bRefresh.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.gridheight = 2;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bRefresh, layoutCons);
+ contentPane.add(bRefresh);
+
+ JButton bNew = new JButton(tr("New"));
+ bNew.setActionCommand("routePattern.overviewNew");
+ bNew.addActionListener(this);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bNew, layoutCons);
+ contentPane.add(bNew);
+
+ JButton bDelete = new JButton(tr("Delete"));
+ bDelete.setActionCommand("routePattern.overviewDelete");
+ bDelete.addActionListener(this);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDelete, layoutCons);
+ contentPane.add(bDelete);
+
+ JButton bDuplicate = new JButton(tr("Duplicate"));
+ bDuplicate.setActionCommand("routePattern.overviewDuplicate");
+ bDuplicate.addActionListener(this);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDuplicate, layoutCons);
+ contentPane.add(bDuplicate);
+
+ JButton bReflect = new JButton(tr("Reflect"));
+ bReflect.setActionCommand("routePattern.overviewReflect");
+ bReflect.addActionListener(this);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bReflect, layoutCons);
+ contentPane.add(bReflect);
+
+ // Tags Tab
+ /* Container */ contentPane = tabTags;
+ /* GridBagLayout */ gridbag = new GridBagLayout();
+ /* GridBagConstraints */ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ /* JLabel */ headline = new JLabel(tr("Required tags:"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(headline, layoutCons);
+ contentPane.add(headline);
+
+ requiredTagsTable = new CustomCellEditorTable();
+ requiredTagsData = new TagTableModel(true);
+ requiredTagsData.addColumn(tr("Key"));
+ requiredTagsData.addColumn(tr("Value"));
+ tagBlacklist = new TreeSet<>();
+ Vector rowContent = new Vector<>();
+ /* TODO: keys and values should also be translated using TransText class */
+ rowContent.add("type");
+ tagBlacklist.add("type");
+ rowContent.add("route");
+ requiredTagsData.addRow(rowContent);
+ JComboBox comboBox = new JComboBox<>();
+ comboBox.addItem("route");
+ requiredTagsTable.setCellEditor(0, 1, new DefaultCellEditor(comboBox));
+ rowContent = new Vector<>();
+ rowContent.add(0, "route");
+ tagBlacklist.add("route");
+ rowContent.add(1, "bus");
+ requiredTagsData.addRow(rowContent);
+ /* JComboBox */ comboBox = new JComboBox<>();
+ comboBox.addItem("bus");
+ comboBox.addItem("trolleybus");
+ comboBox.addItem("tram");
+ comboBox.addItem("light_rail");
+ comboBox.addItem("subway");
+ comboBox.addItem("rail");
+ requiredTagsTable.setCellEditor(1, 1, new DefaultCellEditor(comboBox));
+ rowContent = new Vector<>();
+ rowContent.add(0, "ref");
+ tagBlacklist.add("ref");
+ rowContent.add(1, "");
+ requiredTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "to");
+ tagBlacklist.add("to");
+ rowContent.add(1, "");
+ requiredTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "network");
+ tagBlacklist.add("network");
+ rowContent.add(1, "");
+ requiredTagsData.addRow(rowContent);
+ requiredTagsTable.setModel(requiredTagsData);
+ JScrollPane tableSP = new JScrollPane(requiredTagsTable);
+ requiredTagsData.addTableModelListener(requiredTagsData);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.25;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ Dimension preferredSize = tableSP.getPreferredSize();
+ preferredSize.setSize(tableSP.getPreferredSize().getWidth(),
+ tableSP.getPreferredSize().getHeight() / 4.0);
+ tableSP.setPreferredSize(preferredSize);
+ contentPane.add(tableSP);
+
+ headline = new JLabel(tr("Common tags:"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(headline, layoutCons);
+ contentPane.add(headline);
+
+ commonTagsTable = new CustomCellEditorTable();
+ commonTagsData = new TagTableModel(true);
+ commonTagsData.addColumn(tr("Key"));
+ commonTagsData.addColumn(tr("Value"));
+ rowContent = new Vector<>();
+ rowContent.add(0, "loc_ref");
+ tagBlacklist.add("loc_ref");
+ rowContent.add(1, "");
+ commonTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "direction");
+ tagBlacklist.add("direction");
+ rowContent.add(1, "");
+ commonTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "from");
+ tagBlacklist.add("from");
+ rowContent.add(1, "");
+ commonTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "operator");
+ tagBlacklist.add("operator");
+ rowContent.add(1, "");
+ commonTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "color");
+ tagBlacklist.add("color");
+ rowContent.add(1, "");
+ commonTagsData.addRow(rowContent);
+ rowContent = new Vector<>();
+ rowContent.add(0, "name");
+ tagBlacklist.add("name");
+ rowContent.add(1, "");
+ commonTagsData.addRow(rowContent);
+ commonTagsTable.setModel(commonTagsData);
+ /* JScrollPane */ tableSP = new JScrollPane(commonTagsTable);
+ commonTagsData.addTableModelListener(commonTagsData);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.25;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ /* Dimension */ preferredSize = tableSP.getPreferredSize();
+ preferredSize.setSize(tableSP.getPreferredSize().getWidth(),
+ tableSP.getPreferredSize().getHeight() / 4.0);
+ tableSP.setPreferredSize(preferredSize);
+ contentPane.add(tableSP);
+
+ headline = new JLabel(tr("Additional tags:"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 4;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(headline, layoutCons);
+ contentPane.add(headline);
+
+ otherTagsTable = new CustomCellEditorTable();
+ otherTagsData = new TagTableModel(false);
+ otherTagsData.addColumn(tr("Key"));
+ otherTagsData.addColumn(tr("Value"));
+ otherTagsTable.setModel(otherTagsData);
+ /* JScrollPane */ tableSP = new JScrollPane(otherTagsTable);
+ otherTagsData.addTableModelListener(otherTagsData);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 5;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ /* Dimension */ preferredSize = tableSP.getPreferredSize();
+ preferredSize.setSize(tableSP.getPreferredSize().getWidth(),
+ tableSP.getPreferredSize().getHeight() / 2.0);
+ tableSP.setPreferredSize(preferredSize);
+ contentPane.add(tableSP);
+
+ JButton bAddTag = new JButton(tr("Add a new Tag"));
+ bAddTag.setActionCommand("routePattern.tagAddTag");
+ bAddTag.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 6;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bAddTag, layoutCons);
+ contentPane.add(bAddTag);
+
+ // Itinerary Tab
+ contentPane = tabItinerary;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ itineraryTable = new JTable();
+ itineraryData = new ItineraryTableModel();
+ itineraryData.addColumn(tr("Name/Id"));
+ itineraryData.addColumn(tr("Role"));
+ itineraryTable.setModel(itineraryData);
+ /* JScrollPane */ tableSP = new JScrollPane(itineraryTable);
+ /* JComboBox */ comboBox = new JComboBox<>();
+ comboBox.addItem("");
+ comboBox.addItem("forward");
+ comboBox.addItem("backward");
+ itineraryTable.getColumnModel().getColumn(1)
+ .setCellEditor(new DefaultCellEditor(comboBox));
+ itineraryData.addTableModelListener(itineraryData);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 4;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ contentPane.add(tableSP);
+
+ JButton bFind = new JButton(tr("Find"));
+ bFind.setActionCommand("routePattern.itineraryFind");
+ bFind.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bFind, layoutCons);
+ contentPane.add(bFind);
+
+ JButton bShow = new JButton(tr("Show"));
+ bShow.setActionCommand("routePattern.itineraryShow");
+ bShow.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bShow, layoutCons);
+ contentPane.add(bShow);
+
+ JButton bMark = new JButton(tr("Mark"));
+ bMark.setActionCommand("routePattern.itineraryMark");
+ bMark.addActionListener(this);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bMark, layoutCons);
+ contentPane.add(bMark);
+
+ JButton bAdd = new JButton(tr("Add"));
+ bAdd.setActionCommand("routePattern.itineraryAdd");
+ bAdd.addActionListener(this);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bAdd, layoutCons);
+ contentPane.add(bAdd);
+
+ /* JButton */ bDelete = new JButton(tr("Delete"));
+ bDelete.setActionCommand("routePattern.itineraryDelete");
+ bDelete.addActionListener(this);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDelete, layoutCons);
+ contentPane.add(bDelete);
+
+ JButton bSort = new JButton(tr("Sort"));
+ bSort.setActionCommand("routePattern.itinerarySort");
+ bSort.addActionListener(this);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bSort, layoutCons);
+ contentPane.add(bSort);
+
+ /* JButton */ bReflect = new JButton(tr("Reflect"));
+ bReflect.setActionCommand("routePattern.itineraryReflect");
+ bReflect.addActionListener(this);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bReflect, layoutCons);
+ contentPane.add(bReflect);
+
+ // Stoplist Tab
+ contentPane = tabStoplist;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ stoplistTable = new JTable();
+ stoplistData = new StoplistTableModel();
+ stoplistData.addColumn(tr("Name/Id"));
+ stoplistData.addColumn(tr("Ref"));
+ stoplistData.addColumn(tr("Role"));
+ stoplistData.addColumn(tr("km"));
+ stoplistTable.setModel(stoplistData);
+ /* JScrollPane */ tableSP = new JScrollPane(stoplistTable);
+ /* JComboBox */ comboBox = new JComboBox<>();
+ comboBox.addItem("");
+ comboBox.addItem("forward_stop");
+ comboBox.addItem("backward_stop");
+ stoplistTable.getColumnModel().getColumn(STOPLIST_ROLE_COLUMN)
+ .setCellEditor(new DefaultCellEditor(comboBox));
+ stoplistData.addTableModelListener(new StoplistTableModelListener());
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 4;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ contentPane.add(tableSP);
+
+ /* JButton */ bFind = new JButton(tr("Find"));
+ bFind.setActionCommand("routePattern.stoplistFind");
+ bFind.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bFind, layoutCons);
+ contentPane.add(bFind);
+
+ /* JButton */ bShow = new JButton(tr("Show"));
+ bShow.setActionCommand("routePattern.stoplistShow");
+ bShow.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bShow, layoutCons);
+ contentPane.add(bShow);
+
+ /* JButton */ bMark = new JButton(tr("Mark"));
+ bMark.setActionCommand("routePattern.stoplistMark");
+ bMark.addActionListener(this);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bMark, layoutCons);
+ contentPane.add(bMark);
+
+ /* JButton */ bAdd = new JButton(tr("Add"));
+ bAdd.setActionCommand("routePattern.stoplistAdd");
+ bAdd.addActionListener(this);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bAdd, layoutCons);
+ contentPane.add(bAdd);
+
+ /* JButton */ bDelete = new JButton(tr("Delete"));
+ bDelete.setActionCommand("routePattern.stoplistDelete");
+ bDelete.addActionListener(this);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDelete, layoutCons);
+ contentPane.add(bDelete);
+
+ /* JButton */ bSort = new JButton(tr("Sort"));
+ bSort.setActionCommand("routePattern.stoplistSort");
+ bSort.addActionListener(this);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bSort, layoutCons);
+ contentPane.add(bSort);
+
+ /* JButton */ bReflect = new JButton(tr("Reflect"));
+ bReflect.setActionCommand("routePattern.stoplistReflect");
+ bReflect.addActionListener(this);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bReflect, layoutCons);
+ contentPane.add(bReflect);
+
+ // Meta Tab
+ contentPane = tabMeta;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ JLabel rightleft = new JLabel(tr("Stops are possible on the"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(rightleft, layoutCons);
+ contentPane.add(rightleft);
+
+ cbRight = new JCheckBox(tr("right hand side"), true);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(cbRight, layoutCons);
+ contentPane.add(cbRight);
+
+ cbLeft = new JCheckBox(tr("left hand side"), false);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(cbLeft, layoutCons);
+ contentPane.add(cbLeft);
+
+ JLabel maxdist = new JLabel(tr("Maximum distance from route"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 4;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(maxdist, layoutCons);
+ contentPane.add(maxdist);
+
+ tfSuggestStopsLimit = new JTextField("20", 4);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 5;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfSuggestStopsLimit, layoutCons);
+ contentPane.add(tfSuggestStopsLimit);
+
+ JLabel meters = new JLabel(tr("meters"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 5;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(meters, layoutCons);
+ contentPane.add(meters);
+
+ JButton bSuggestStops = new JButton(tr("Suggest Stops"));
+ bSuggestStops.setActionCommand("routePattern.metaSuggestStops");
+ bSuggestStops.addActionListener(this);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 6;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bSuggestStops, layoutCons);
+ contentPane.add(bSuggestStops);
+
+ jDialog.pack();
+ }
+
+ if ("routePattern.refresh".equals(event.getActionCommand())) {
+ refreshData();
+ } else if ("routePattern.overviewNew".equals(event.getActionCommand())) {
+ currentRoute = new Relation();
+ currentRoute.put("type", "route");
+ currentRoute.put("route", "bus");
+ mainDataSet.addPrimitive(currentRoute);
+
+ refreshData();
+
+ for (int i = 0; i < relsListModel.size(); ++i) {
+ if (currentRoute == relsListModel.elementAt(i).route)
+ relsList.setSelectedIndex(i);
+ }
+ } else if ("routePattern.overviewDuplicate".equals(event.getActionCommand())) {
+ currentRoute = new Relation(currentRoute, true);
+ currentRoute.put("type", "route");
+ currentRoute.put("route", "bus");
+ mainDataSet.addPrimitive(currentRoute);
+
+ refreshData();
+
+ for (int i = 0; i < relsListModel.size(); ++i) {
+ if (currentRoute == relsListModel.elementAt(i).route)
+ relsList.setSelectedIndex(i);
+ }
+ } else if ("routePattern.overviewReflect".equals(event.getActionCommand())) {
+ currentRoute.setModified(true);
+ String tag_from = currentRoute.get("from");
+ String tag_to = currentRoute.get("to");
+ currentRoute.put("from", tag_to);
+ currentRoute.put("to", tag_from);
+
+ Vector itemsToReflect = new Vector<>();
+ Vector otherItems = new Vector<>();
+
+ // Temp
+ // Node firstNode = null;
+ // Node lastNode = null;
+
+ for (int i = 0; i < currentRoute.getMembersCount(); ++i) {
+ RelationMember item = currentRoute.getMember(i);
+
+ if (item.isWay()) {
+ String role = item.getRole();
+ if ("backward".equals(role))
+ role = "forward";
+ else if ("forward".equals(role))
+ role = "backward";
+ else
+ role = "backward";
+
+ itemsToReflect.add(new RelationMember(role, item.getWay()));
+
+ // Temp
+ // if (firstNode == null) {
+ // firstNode = item.getWay().getNode(0);
+ // }
+ // lastNode = item.getWay().getNode(item.getWay().getNodesCount() - 1);
+ } else if (item.isNode())
+ itemsToReflect.add(item);
+ else
+ otherItems.add(item);
+ }
+
+ currentRoute.setMembers(null);
+ for (int i = itemsToReflect.size() - 1; i >= 0; --i) {
+ currentRoute.addMember(itemsToReflect.elementAt(i));
+ }
+ for (int i = 0; i < otherItems.size(); ++i) {
+ currentRoute.addMember(otherItems.elementAt(i));
+ }
+
+ refreshData();
+
+ for (int i = 0; i < relsListModel.size(); ++i) {
+ if (currentRoute == relsListModel.elementAt(i).route)
+ relsList.setSelectedIndex(i);
+ }
+
+ // Temp
+ /*
+ * if (firstNode != null) {
+ * Vector< AStarAlgorithm.Edge > path = new PublicTransportAStar(firstNode, lastNode).shortestPath(); Iterator<
+ * AStarAlgorithm.Edge > iter = path.iterator(); while (iter.hasNext()) { PublicTransportAStar.PartialWayEdge edge =
+ * (PublicTransportAStar.PartialWayEdge)iter.next(); System.out.print(edge.way.getUniqueId()); System.out.print("\t");
+ * System.out.print(edge.beginIndex); System.out.print("\t"); System.out.print(edge.endIndex); System.out.print("\n"); } }
+ */
+ } else if ("routePattern.overviewDelete".equals(event.getActionCommand())) {
+ DeleteAction.deleteRelation(MainApplication.getLayerManager().getEditLayer(), currentRoute);
+
+ currentRoute = null;
+ tabbedPane.setEnabledAt(1, false);
+ tabbedPane.setEnabledAt(2, false);
+ tabbedPane.setEnabledAt(3, false);
+ tabbedPane.setEnabledAt(4, false);
+
+ refreshData();
+ } else if ("routePattern.tagAddTag".equals(event.getActionCommand())) {
+ Vector rowContent = new Vector<>();
+ rowContent.add("");
+ rowContent.add("");
+ otherTagsData.addRow(rowContent);
+ } else if ("routePattern.itineraryFind".equals(event.getActionCommand())) {
+ if (mainDataSet == null)
+ return;
+
+ itineraryTable.clearSelection();
+
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryData.ways.elementAt(i) != null
+ && mainDataSet.isSelected(itineraryData.ways.elementAt(i)))
+ itineraryTable.addRowSelectionInterval(i, i);
+ }
+ } else if ("routePattern.itineraryShow".equals(event.getActionCommand())) {
+ BoundingXYVisitor box = new BoundingXYVisitor();
+ if (itineraryTable.getSelectedRowCount() > 0) {
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryTable.isRowSelected(i)
+ && itineraryData.ways.elementAt(i) != null) {
+ itineraryData.ways.elementAt(i).accept((PrimitiveVisitor) box);
+ }
+ }
+ } else {
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryData.ways.elementAt(i) != null) {
+ itineraryData.ways.elementAt(i).accept((PrimitiveVisitor) box);
+ }
+ }
+ }
+ if (box.getBounds() == null)
+ return;
+ box.enlargeBoundingBox();
+ MainApplication.getMap().mapView.zoomTo(box);
+ } else if ("routePattern.itineraryMark".equals(event.getActionCommand())) {
+ OsmPrimitive[] osmp = {null};
+ MainApplication.getLayerManager().getEditDataSet().setSelected(osmp);
+ markedWays.clear();
+ if (itineraryTable.getSelectedRowCount() > 0) {
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryTable.isRowSelected(i)
+ && itineraryData.ways.elementAt(i) != null) {
+ mainDataSet.addSelected(itineraryData.ways.elementAt(i));
+
+ RelationMember markedWay = new RelationMember(
+ (String) itineraryData.getValueAt(i, 1),
+ itineraryData.ways.elementAt(i));
+ markedWays.addElement(markedWay);
+ }
+ }
+ } else {
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryData.ways.elementAt(i) != null) {
+ mainDataSet.addSelected(itineraryData.ways.elementAt(i));
+
+ RelationMember markedWay = new RelationMember(
+ (String) itineraryData.getValueAt(i, 1),
+ itineraryData.ways.elementAt(i));
+ markedWays.addElement(markedWay);
+ }
+ }
+ }
+ } else if ("routePattern.itineraryAdd".equals(event.getActionCommand())) {
+ int insPos = itineraryTable.getSelectedRow();
+ Iterator relIter = markedWays.iterator();
+ TreeSet addedWays = new TreeSet<>();
+ if (mainDataSet == null)
+ return;
+
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ if (curMember.isWay() && mainDataSet.isSelected(curMember.getWay())) {
+ itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole());
+ if (insPos >= 0)
+ ++insPos;
+
+ addedWays.add(curMember.getWay());
+ }
+ }
+
+ Collection selectedWays = mainDataSet.getSelectedWays();
+ Iterator wayIter = selectedWays.iterator();
+
+ while (wayIter.hasNext()) {
+ Way curMember = wayIter.next();
+ if (!addedWays.contains(curMember)) {
+ itineraryData.insertRow(insPos, curMember, "");
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+
+ if ((insPos > 0) && (insPos < itineraryData.getRowCount())) {
+ while ((insPos < itineraryData.getRowCount())
+ && (itineraryData.ways.elementAt(insPos) == null)) {
+ ++insPos;
+ }
+ itineraryTable.removeRowSelectionInterval(0, itineraryData.getRowCount() - 1);
+ if (insPos < itineraryData.getRowCount())
+ itineraryTable.addRowSelectionInterval(insPos, insPos);
+ }
+
+ itineraryData.cleanupGaps();
+ segmentMetrics = fillSegmentMetrics();
+ rebuildWays();
+ } else if ("routePattern.itineraryDelete".equals(event.getActionCommand())) {
+ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) {
+ if (itineraryTable.isRowSelected(i)
+ && itineraryData.ways.elementAt(i) != null) {
+ itineraryData.ways.removeElementAt(i);
+ itineraryData.removeRow(i);
+ }
+ }
+
+ itineraryData.cleanupGaps();
+ segmentMetrics = fillSegmentMetrics();
+ rebuildWays();
+ } else if ("routePattern.itinerarySort".equals(event.getActionCommand())) {
+ TreeSet usedWays = new TreeSet<>();
+ TreeMap> frontNodes = new TreeMap<>();
+ TreeMap> backNodes = new TreeMap<>();
+ Vector> loops = new Vector<>();
+ int insPos = itineraryTable.getSelectedRow();
+
+ if (itineraryTable.getSelectedRowCount() > 0) {
+ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) {
+ if (itineraryTable.isRowSelected(i)
+ && itineraryData.ways.elementAt(i) != null) {
+ if (!usedWays.contains(itineraryData.ways.elementAt(i))) {
+ addWayToSortingData(itineraryData.ways.elementAt(i), frontNodes,
+ backNodes, loops);
+ usedWays.add(itineraryData.ways.elementAt(i));
+ }
+
+ itineraryData.ways.removeElementAt(i);
+ itineraryData.removeRow(i);
+ }
+ }
+ } else {
+ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) {
+ if (itineraryData.ways.elementAt(i) != null) {
+ if (!usedWays.contains(itineraryData.ways.elementAt(i))) {
+ addWayToSortingData(itineraryData.ways.elementAt(i), frontNodes,
+ backNodes, loops);
+ usedWays.add(itineraryData.ways.elementAt(i));
+ }
+ }
+ }
+
+ itineraryData.clear();
+ }
+
+ Iterator>> entryIter = frontNodes.entrySet()
+ .iterator();
+ while (entryIter.hasNext()) {
+ Iterator relIter = entryIter.next().getValue().iterator();
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole());
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+
+ Iterator> listIter = loops.iterator();
+ while (listIter.hasNext()) {
+ Iterator relIter = listIter.next().iterator();
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole());
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+
+ itineraryData.cleanupGaps();
+ segmentMetrics = fillSegmentMetrics();
+ rebuildWays();
+ } else if ("routePattern.itineraryReflect".equals(event.getActionCommand())) {
+ Vector itemsToReflect = new Vector<>();
+ int insPos = itineraryTable.getSelectedRow();
+
+ if (itineraryTable.getSelectedRowCount() > 0) {
+ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) {
+ if (itineraryTable.isRowSelected(i)
+ && itineraryData.ways.elementAt(i) != null) {
+ String role = (String) itineraryData.getValueAt(i, 1);
+ if ("backward".equals(role))
+ role = "forward";
+ else if ("forward".equals(role))
+ role = "backward";
+ else
+ role = "backward";
+ RelationMember markedWay = new RelationMember(role,
+ itineraryData.ways.elementAt(i));
+ itemsToReflect.addElement(markedWay);
+
+ itineraryData.ways.removeElementAt(i);
+ itineraryData.removeRow(i);
+ }
+ }
+ } else {
+ for (int i = itineraryData.getRowCount() - 1; i >= 0; --i) {
+ if (itineraryData.ways.elementAt(i) != null) {
+ String role = (String) itineraryData.getValueAt(i, 1);
+ if ("backward".equals(role))
+ role = "forward";
+ else if ("forward".equals(role))
+ role = "backward";
+ else
+ role = "backward";
+ RelationMember markedWay = new RelationMember(role,
+ itineraryData.ways.elementAt(i));
+ itemsToReflect.addElement(markedWay);
+ }
+ }
+
+ itineraryData.clear();
+ }
+
+ int startPos = insPos;
+ Iterator relIter = itemsToReflect.iterator();
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ if (curMember.isWay()) {
+ itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole());
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+ if (insPos >= 0)
+ itineraryTable.addRowSelectionInterval(startPos, insPos - 1);
+
+ itineraryData.cleanupGaps();
+ segmentMetrics = fillSegmentMetrics();
+ rebuildWays();
+ } else if ("routePattern.stoplistFind".equals(event.getActionCommand())) {
+ if (mainDataSet == null)
+ return;
+
+ stoplistTable.clearSelection();
+
+ for (int i = 0; i < stoplistData.getRowCount(); ++i) {
+ if (stoplistData.nodes.elementAt(i) != null
+ && mainDataSet.isSelected(stoplistData.nodes.elementAt(i)))
+ stoplistTable.addRowSelectionInterval(i, i);
+ }
+ } else if ("routePattern.stoplistShow".equals(event.getActionCommand())) {
+ BoundingXYVisitor box = new BoundingXYVisitor();
+ if (stoplistTable.getSelectedRowCount() > 0) {
+ for (int i = 0; i < stoplistData.getRowCount(); ++i) {
+ if (stoplistTable.isRowSelected(i)) {
+ stoplistData.nodes.elementAt(i).accept((PrimitiveVisitor) box);
+ }
+ }
+ } else {
+ for (int i = 0; i < stoplistData.getRowCount(); ++i) {
+ stoplistData.nodes.elementAt(i).accept((PrimitiveVisitor) box);
+ }
+ }
+ if (box.getBounds() == null)
+ return;
+ box.enlargeBoundingBox();
+ MainApplication.getMap().mapView.zoomTo(box);
+ } else if ("routePattern.stoplistMark".equals(event.getActionCommand())) {
+ OsmPrimitive[] osmp = {null};
+ MainApplication.getLayerManager().getEditDataSet().setSelected(osmp);
+ markedNodes.clear();
+ if (stoplistTable.getSelectedRowCount() > 0) {
+ for (int i = 0; i < stoplistData.getRowCount(); ++i) {
+ if (stoplistTable.isRowSelected(i)) {
+ mainDataSet.addSelected(stoplistData.nodes.elementAt(i));
+
+ RelationMember markedNode = new RelationMember(
+ (String) stoplistData.getValueAt(i, 1),
+ stoplistData.nodes.elementAt(i));
+ markedNodes.addElement(markedNode);
+ }
+ }
+ } else {
+ for (int i = 0; i < stoplistData.getRowCount(); ++i) {
+ mainDataSet.addSelected(stoplistData.nodes.elementAt(i));
+
+ RelationMember markedNode = new RelationMember(
+ (String) stoplistData.getValueAt(i, 1),
+ stoplistData.nodes.elementAt(i));
+ markedNodes.addElement(markedNode);
+ }
+ }
+ } else if ("routePattern.stoplistAdd".equals(event.getActionCommand())) {
+ int insPos = stoplistTable.getSelectedRow();
+ Iterator relIter = markedNodes.iterator();
+ TreeSet addedNodes = new TreeSet<>();
+ if (mainDataSet == null)
+ return;
+
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ if (curMember.isNode() && mainDataSet.isSelected(curMember.getNode())) {
+ StopReference sr = detectMinDistance(curMember.getNode(), segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(),
+ calcOffset(sr, segmentMetrics));
+ if (insPos >= 0)
+ ++insPos;
+
+ addedNodes.add(curMember.getNode());
+ }
+ }
+
+ Collection selectedNodes = mainDataSet.getSelectedNodes();
+ Iterator nodeIter = selectedNodes.iterator();
+
+ while (nodeIter.hasNext()) {
+ Node curMember = nodeIter.next();
+ if (!addedNodes.contains(curMember)) {
+ StopReference sr = detectMinDistance(curMember, segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ stoplistData.insertRow(insPos, curMember, "", calcOffset(sr, segmentMetrics));
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+
+ if ((insPos > 0) && (insPos < stoplistData.getRowCount())) {
+ while ((insPos < stoplistData.getRowCount())
+ && (stoplistData.nodes.elementAt(insPos) == null)) {
+ ++insPos;
+ }
+ stoplistTable.removeRowSelectionInterval(0, stoplistData.getRowCount() - 1);
+ if (insPos < stoplistData.getRowCount())
+ stoplistTable.addRowSelectionInterval(insPos, insPos);
+ }
+
+ rebuildNodes();
+ } else if ("routePattern.stoplistDelete".equals(event.getActionCommand())) {
+ for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) {
+ if (stoplistTable.isRowSelected(i)) {
+ stoplistData.nodes.removeElementAt(i);
+ stoplistData.removeRow(i);
+ }
+ }
+
+ rebuildNodes();
+ } else if ("routePattern.stoplistSort".equals(event.getActionCommand())) {
+ // Prepare Segments: The segments of all usable ways are arranged in a linear
+ // list such that a coor can directly be checked concerning position and offset
+ Vector srm = new Vector<>();
+ int insPos = stoplistTable.getSelectedRow();
+ if (stoplistTable.getSelectedRowCount() > 0) {
+ // Determine for each member its position on the itinerary: position means here the
+ // point on the itinerary that has minimal distance to the coor
+ for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) {
+ if (stoplistTable.isRowSelected(i)) {
+ StopReference sr = detectMinDistance(stoplistData.nodes.elementAt(i),
+ segmentMetrics, cbRight.isSelected(), cbLeft.isSelected());
+ if (sr != null) {
+ if (sr.distance < Double.parseDouble(tfSuggestStopsLimit.getText())
+ * 9.0 / 1000000.0) {
+ sr.role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
+ srm.addElement(sr);
+ } else {
+ sr.role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
+ sr.index = segmentMetrics.size() * 2;
+ sr.pos = 0;
+ srm.addElement(sr);
+ }
+
+ stoplistData.nodes.removeElementAt(i);
+ stoplistData.removeRow(i);
+ }
+ }
+ }
+ } else {
+ // Determine for each member its position on the itinerary: position means here the
+ // point on the itinerary that has minimal distance to the coor
+ for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) {
+ StopReference sr = detectMinDistance(stoplistData.nodes.elementAt(i),
+ segmentMetrics, cbRight.isSelected(), cbLeft.isSelected());
+ if (sr != null) {
+ if (sr.distance < Double.parseDouble(tfSuggestStopsLimit.getText()) * 9.0
+ / 1000000.0) {
+ sr.role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
+ srm.addElement(sr);
+ } else {
+ sr.role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
+ sr.index = segmentMetrics.size() * 2;
+ sr.pos = 0;
+ srm.addElement(sr);
+ }
+ }
+ }
+
+ stoplistData.clear();
+ }
+
+ Collections.sort(srm);
+
+ for (int i = 0; i < srm.size(); ++i) {
+ StopReference sr = detectMinDistance(srm.elementAt(i).node, segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ stoplistData.insertRow(insPos, srm.elementAt(i).node, srm.elementAt(i).role,
+ calcOffset(sr, segmentMetrics));
+ if (insPos >= 0)
+ ++insPos;
+ }
+
+ rebuildNodes();
+ } else if ("routePattern.stoplistReflect".equals(event.getActionCommand())) {
+ Vector itemsToReflect = new Vector<>();
+ int insPos = stoplistTable.getSelectedRow();
+
+ if (stoplistTable.getSelectedRowCount() > 0) {
+ for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) {
+ if (stoplistTable.isRowSelected(i)) {
+ String role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
+ RelationMember markedNode = new RelationMember(role,
+ stoplistData.nodes.elementAt(i));
+ itemsToReflect.addElement(markedNode);
+
+ stoplistData.nodes.removeElementAt(i);
+ stoplistData.removeRow(i);
+ }
+ }
+ } else {
+ for (int i = stoplistData.getRowCount() - 1; i >= 0; --i) {
+ String role = (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN);
+ RelationMember markedNode = new RelationMember(role,
+ stoplistData.nodes.elementAt(i));
+ itemsToReflect.addElement(markedNode);
+ }
+
+ stoplistData.clear();
+ }
+
+ int startPos = insPos;
+ Iterator relIter = itemsToReflect.iterator();
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ if (curMember.isNode()) {
+ StopReference sr = detectMinDistance(curMember.getNode(), segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(),
+ calcOffset(sr, segmentMetrics));
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+ if (insPos >= 0)
+ stoplistTable.addRowSelectionInterval(startPos, insPos - 1);
+
+ rebuildNodes();
+ } else if ("routePattern.metaSuggestStops".equals(event.getActionCommand())) {
+ // Prepare Segments: The segments of all usable ways are arranged in a linear
+ // list such that a coor can directly be checked concerning position and offset
+ Vector srm = new Vector<>();
+ // Determine for each member its position on the itinerary: position means here the
+ // point on the itinerary that has minimal distance to the coor
+ mainDataSet = MainApplication.getLayerManager().getEditDataSet();
+ if (mainDataSet != null) {
+ String stopKey = "";
+ String stopValue = "";
+ if ("bus".equals(currentRoute.get("route"))) {
+ stopKey = "highway";
+ stopValue = "bus_stop";
+ } else if ("trolleybus".equals(currentRoute.get("route"))) {
+ stopKey = "highway";
+ stopValue = "bus_stop";
+ } else if ("tram".equals(currentRoute.get("route"))) {
+ stopKey = "railway";
+ stopValue = "tram_stop";
+ } else if ("light_rail".equals(currentRoute.get("route"))) {
+ stopKey = "railway";
+ stopValue = "station";
+ } else if ("subway".equals(currentRoute.get("route"))) {
+ stopKey = "railway";
+ stopValue = "station";
+ } else if ("rail".equals(currentRoute.get("route"))) {
+ stopKey = "railway";
+ stopValue = "station";
+ }
+
+ Collection nodeCollection = mainDataSet.getNodes();
+ Iterator nodeIter = nodeCollection.iterator();
+ while (nodeIter.hasNext()) {
+ Node currentNode = nodeIter.next();
+ if (!currentNode.isUsable())
+ continue;
+ if (stopValue.equals(currentNode.get(stopKey))) {
+ StopReference sr = detectMinDistance(currentNode, segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ if ((sr != null)
+ && (sr.distance < Double.parseDouble(tfSuggestStopsLimit.getText())
+ * 9.0 / 1000000.0))
+ srm.addElement(sr);
+ }
+ }
+ } else {
+ JOptionPane.showMessageDialog(null,
+ tr("There exists no dataset."
+ + " Try to download data from the server or open an OSM file."),
+ tr("No data found"), JOptionPane.ERROR_MESSAGE);
+ }
+
+ Collections.sort(srm);
+
+ stoplistData.clear();
+ for (int i = 0; i < srm.size(); ++i) {
+ StopReference sr = detectMinDistance(srm.elementAt(i).node, segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ stoplistData.addRow(srm.elementAt(i).node, srm.elementAt(i).role,
+ calcOffset(sr, segmentMetrics));
+ }
+
+ rebuildNodes();
+ } else {
+ refreshData();
+
+ jDialog.setLocationRelativeTo(frame);
+ jDialog.setVisible(true);
+ }
+ }
+
+ private void refreshData() {
+ Relation copy = currentRoute;
+ relsListModel.clear();
+ currentRoute = copy;
+
+ DataSet mainDataSet = MainApplication.getLayerManager().getEditDataSet();
+ if (mainDataSet != null) {
+ Vector relRefs = new Vector<>();
+ Collection relCollection = mainDataSet.getRelations();
+ Iterator relIter = relCollection.iterator();
+
+ while (relIter.hasNext()) {
+ Relation currentRel = relIter.next();
+ if (!currentRel.isDeleted()) {
+ String routeVal = currentRel.get("route");
+ if ("bus".equals(routeVal))
+ relRefs.add(new RouteReference(currentRel));
+ else if ("trolleybus".equals(routeVal))
+ relRefs.add(new RouteReference(currentRel));
+ else if ("tram".equals(routeVal))
+ relRefs.add(new RouteReference(currentRel));
+ else if ("light_rail".equals(routeVal))
+ relRefs.add(new RouteReference(currentRel));
+ else if ("subway".equals(routeVal))
+ relRefs.add(new RouteReference(currentRel));
+ else if ("rail".equals(routeVal))
+ relRefs.add(new RouteReference(currentRel));
+ }
+ }
+
+ Collections.sort(relRefs);
+
+ Iterator iter = relRefs.iterator();
+ while (iter.hasNext()) {
+ relsListModel.addElement(iter.next());
+ }
+ } else {
+ JOptionPane.showMessageDialog(null,
+ tr("There exists no dataset."
+ + " Try to download data from the server or open an OSM file."),
+ tr("No data found"), JOptionPane.ERROR_MESSAGE);
+ }
+ }
+
+ // Rebuild ways in the relation currentRoute
+ public static void rebuildWays() {
+ currentRoute.setModified(true);
+ List members = currentRoute.getMembers();
+ ListIterator iter = members.listIterator();
+ while (iter.hasNext()) {
+ if (iter.next().isWay())
+ iter.remove();
+ }
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryData.ways.elementAt(i) != null) {
+ RelationMember member = new RelationMember(
+ (String) itineraryData.getValueAt(i, 1), itineraryData.ways.elementAt(i));
+ members.add(member);
+ }
+ }
+ currentRoute.setMembers(members);
+ }
+
+ // Rebuild nodes in the relation currentRoute
+ private void rebuildNodes() {
+ currentRoute.setModified(true);
+ for (int i = currentRoute.getMembersCount() - 1; i >= 0; --i) {
+ if (currentRoute.getMember(i).isNode()) {
+ currentRoute.removeMember(i);
+ }
+ }
+ for (int i = 0; i < stoplistData.getRowCount(); ++i) {
+ RelationMember member = new RelationMember(
+ (String) stoplistData.getValueAt(i, STOPLIST_ROLE_COLUMN),
+ stoplistData.nodes.elementAt(i));
+ currentRoute.addMember(member);
+ }
+ }
+
+ private void addWayToSortingData(Way way, TreeMap> frontNodes,
+ TreeMap> backNodes,
+ Vector> loops) {
+ if (way.getNodesCount() < 1)
+ return;
+
+ Node firstNode = way.getNode(0);
+ Node lastNode = way.getNode(way.getNodesCount() - 1);
+
+ if (frontNodes.get(firstNode) != null) {
+ LinkedList list = frontNodes.get(firstNode);
+ list.addFirst(new RelationMember("backward", way));
+ frontNodes.remove(firstNode);
+
+ Node lastListNode;
+ if ("backward".equals(list.getLast().getRole()))
+ lastListNode = list.getLast().getWay().getNode(0);
+ else
+ lastListNode = list.getLast().getWay()
+ .getNode(list.getLast().getWay().getNodesCount() - 1);
+ if (lastNode.equals(lastListNode)) {
+ backNodes.remove(lastListNode);
+ loops.add(list);
+ } else if (frontNodes.get(lastNode) != null) {
+ backNodes.remove(lastListNode);
+ LinkedList listToAppend = frontNodes.get(lastNode);
+ Iterator memberIter = list.iterator();
+ while (memberIter.hasNext()) {
+ RelationMember member = memberIter.next();
+ if ("backward".equals(member.getRole()))
+ listToAppend.addFirst(new RelationMember("forward", member.getWay()));
+ else
+ listToAppend.addFirst(new RelationMember("backward", member.getWay()));
+ }
+ frontNodes.remove(lastNode);
+ frontNodes.put(lastListNode, listToAppend);
+ } else if (backNodes.get(lastNode) != null) {
+ backNodes.remove(lastListNode);
+ LinkedList listToAppend = backNodes.get(lastNode);
+ Iterator memberIter = list.iterator();
+ while (memberIter.hasNext()) {
+ RelationMember member = memberIter.next();
+ listToAppend.addLast(member);
+ }
+ backNodes.remove(lastNode);
+ backNodes.put(lastListNode, listToAppend);
+ } else
+ frontNodes.put(lastNode, list);
+ } else if (backNodes.get(firstNode) != null) {
+ LinkedList list = backNodes.get(firstNode);
+ list.addLast(new RelationMember("forward", way));
+ backNodes.remove(firstNode);
+
+ Node firstListNode;
+ if ("backward".equals(list.getFirst().getRole()))
+ firstListNode = list.getFirst().getWay()
+ .getNode(list.getFirst().getWay().getNodesCount() - 1);
+ else
+ firstListNode = list.getFirst().getWay().getNode(0);
+ if (lastNode.equals(firstListNode)) {
+ frontNodes.remove(firstListNode);
+ loops.add(list);
+ } else if (frontNodes.get(lastNode) != null) {
+ frontNodes.remove(firstListNode);
+ LinkedList listToAppend = frontNodes.get(lastNode);
+ ListIterator memberIter = list.listIterator(list.size());
+ while (memberIter.hasPrevious()) {
+ RelationMember member = memberIter.previous();
+ listToAppend.addFirst(member);
+ }
+ frontNodes.remove(lastNode);
+ frontNodes.put(firstListNode, listToAppend);
+ } else if (backNodes.get(lastNode) != null) {
+ frontNodes.remove(firstListNode);
+ LinkedList listToAppend = backNodes.get(lastNode);
+ ListIterator memberIter = list.listIterator(list.size());
+ while (memberIter.hasPrevious()) {
+ RelationMember member = memberIter.previous();
+ if ("backward".equals(member.getRole()))
+ listToAppend.addLast(new RelationMember("forward", member.getWay()));
+ else
+ listToAppend.addLast(new RelationMember("backward", member.getWay()));
+ }
+ backNodes.remove(lastNode);
+ backNodes.put(firstListNode, listToAppend);
+ } else
+ backNodes.put(lastNode, list);
+ } else if (frontNodes.get(lastNode) != null) {
+ LinkedList list = frontNodes.get(lastNode);
+ list.addFirst(new RelationMember("forward", way));
+ frontNodes.remove(lastNode);
+ frontNodes.put(firstNode, list);
+ } else if (backNodes.get(lastNode) != null) {
+ LinkedList list = backNodes.get(lastNode);
+ list.addLast(new RelationMember("backward", way));
+ backNodes.remove(lastNode);
+ backNodes.put(firstNode, list);
+ } else {
+ LinkedList newList = new LinkedList<>();
+ newList.add(new RelationMember("forward", way));
+ frontNodes.put(firstNode, newList);
+ backNodes.put(lastNode, newList);
+ }
+ }
+
+ private void routesSelectionChanged() {
+ int selectedPos = relsList.getAnchorSelectionIndex();
+ if (relsList.isSelectedIndex(selectedPos)) {
+ currentRoute = relsListModel.elementAt(selectedPos).route;
+ tabbedPane.setEnabledAt(1, true);
+ tabbedPane.setEnabledAt(2, true);
+ tabbedPane.setEnabledAt(3, true);
+ tabbedPane.setEnabledAt(4, true);
+
+ // Prepare Tags
+ requiredTagsData.readRelation(currentRoute);
+ commonTagsData.readRelation(currentRoute);
+ otherTagsData.readRelation(currentRoute, tagBlacklist);
+
+ // Prepare Itinerary
+ itineraryData.clear();
+ List relMembers = currentRoute.getMembers();
+ Iterator relIter = relMembers.iterator();
+ fillItineraryTable(relIter, 0, -1);
+
+ // Prepare Stoplist
+ stoplistData.clear();
+ /* List */ relMembers = currentRoute.getMembers();
+ /* Iterator */ relIter = relMembers.iterator();
+ fillStoplistTable(relIter, -1);
+ } else {
+ currentRoute = null;
+ tabbedPane.setEnabledAt(1, false);
+ tabbedPane.setEnabledAt(2, false);
+ tabbedPane.setEnabledAt(3, false);
+ tabbedPane.setEnabledAt(4, false);
+ }
+ }
+
+ private void fillItineraryTable(Iterator relIter, long lastNodeId, int insPos) {
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ if (curMember.isWay()) {
+ itineraryData.insertRow(insPos, curMember.getWay(), curMember.getRole());
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+ itineraryData.cleanupGaps();
+ segmentMetrics = fillSegmentMetrics();
+ }
+
+ private double calcOffset(StopReference sr, Vector segmentMetrics) {
+ double offset = 0;
+ int size = segmentMetrics.size();
+ if ((sr.index + 1) / 2 < size) {
+ offset = segmentMetrics.elementAt((sr.index + 1) / 2).distance;
+ if (sr.index % 2 == 0)
+ offset += sr.pos;
+ } else if (size > 0) {
+ offset = segmentMetrics.elementAt(size - 1).distance
+ + segmentMetrics.elementAt(size - 1).length;
+ }
+ return offset;
+ }
+
+ private void fillStoplistTable(Iterator relIter, int insPos) {
+
+ while (relIter.hasNext()) {
+ RelationMember curMember = relIter.next();
+ if (curMember.isNode()) {
+ StopReference sr = detectMinDistance(curMember.getNode(), segmentMetrics,
+ cbRight.isSelected(), cbLeft.isSelected());
+ if (sr == null)
+ stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(), 360.0);
+ else {
+ stoplistData.insertRow(insPos, curMember.getNode(), curMember.getRole(),
+ calcOffset(sr, segmentMetrics));
+ if (insPos >= 0)
+ ++insPos;
+ }
+ }
+ }
+ }
+
+ private Vector fillSegmentMetrics() {
+ Vector segmentMetrics = new Vector<>();
+ double distance = 0;
+ for (int i = 0; i < itineraryData.getRowCount(); ++i) {
+ if (itineraryData.ways.elementAt(i) != null) {
+ Way way = itineraryData.ways.elementAt(i);
+ if (!way.isIncomplete()) {
+ if ("backward".equals(itineraryData.getValueAt(i, 1))) {
+ for (int j = way.getNodesCount() - 2; j >= 0; --j) {
+ SegmentMetric sm = new SegmentMetric(way.getNode(j + 1).getCoor().lat(),
+ way.getNode(j + 1).getCoor().lon(),
+ way.getNode(j).getCoor().lat(), way.getNode(j).getCoor().lon(),
+ distance);
+ segmentMetrics.add(sm);
+ distance += sm.length;
+ }
+ } else {
+ for (int j = 0; j < way.getNodesCount() - 1; ++j) {
+ SegmentMetric sm = new SegmentMetric(way.getNode(j).getCoor().lat(),
+ way.getNode(j).getCoor().lon(),
+ way.getNode(j + 1).getCoor().lat(),
+ way.getNode(j + 1).getCoor().lon(), distance);
+ segmentMetrics.add(sm);
+ distance += sm.length;
+ }
+ }
+ }
+ } else
+ segmentMetrics.add(null);
+ }
+ return segmentMetrics;
+ }
+
+ private StopReference detectMinDistance(Node node, Vector segmentMetrics,
+ boolean rhsPossible, boolean lhsPossible) {
+ if (node == null || node.getCoor() == null)
+ return null;
+
+ int minIndex = -1;
+ double position = -1.0;
+ double distance = 180.0;
+ double lat = node.getCoor().lat();
+ double lon = node.getCoor().lon();
+
+ int curIndex = -2;
+ double angleLat = 100.0;
+ double angleLon = 200.0;
+ Iterator iter = segmentMetrics.iterator();
+ while (iter.hasNext()) {
+ curIndex += 2;
+ SegmentMetric sm = iter.next();
+
+ if (sm == null) {
+ angleLat = 100.0;
+ angleLon = 200.0;
+
+ continue;
+ }
+
+ double curPosition = (lat - sm.aLat) * sm.d1 + (lon - sm.aLon) * sm.d2;
+
+ if (curPosition < 0) {
+ if (angleLat <= 90.0) {
+ double lastSegAngle = Math.atan2(angleLat - sm.aLat, angleLon - sm.aLon);
+ double segAngle = Math.atan2(sm.d1, -sm.o1);
+ double vertexAngle = Math.atan2(lat - sm.aLat, lon - sm.aLon);
+
+ boolean vertexOnSeg = (vertexAngle == segAngle)
+ || (vertexAngle == lastSegAngle);
+ boolean vertexOnTheLeft = !vertexOnSeg
+ && (((lastSegAngle > vertexAngle) && (vertexAngle > segAngle))
+ || ((vertexAngle > segAngle) && (segAngle > lastSegAngle))
+ || ((segAngle > lastSegAngle) && (lastSegAngle > vertexAngle)));
+
+ double currentDistance = Math
+ .sqrt((lat - sm.aLat) * (lat - sm.aLat) + (lon - sm.aLon)
+ * (lon - sm.aLon) * Math.cos(sm.aLat * Math.PI / 180.0)
+ * Math.cos(sm.aLat * Math.PI / 180.0));
+ curPosition = vertexAngle - segAngle;
+ if (vertexOnTheLeft)
+ curPosition = -curPosition;
+ if (curPosition < 0)
+ curPosition += 2 * Math.PI;
+ if ((Math.abs(currentDistance) < distance)
+ && ((!vertexOnTheLeft && rhsPossible)
+ || (vertexOnTheLeft && lhsPossible) || vertexOnSeg)) {
+ distance = Math.abs(currentDistance);
+ minIndex = curIndex - 1;
+ position = curPosition;
+ }
+ }
+ angleLat = 100.0;
+ angleLon = 200.0;
+ } else if (curPosition > sm.length) {
+ angleLat = sm.aLat;
+ angleLon = sm.aLon;
+ } else {
+ double currentDistance = (lat - sm.aLat) * sm.o1 + (lon - sm.aLon) * sm.o2;
+ if ((Math.abs(currentDistance) < distance)
+ && ((currentDistance >= 0 && rhsPossible)
+ || (currentDistance <= 0 && lhsPossible))) {
+ distance = Math.abs(currentDistance);
+ minIndex = curIndex;
+ position = curPosition;
+ }
+
+ angleLat = 100.0;
+ angleLon = 200.0;
+ }
+ }
+
+ if (minIndex == -1)
+ return new StopReference(segmentMetrics.size() * 2, 0, 180.0, node.get("name"), "",
+ node);
+
+ return new StopReference(minIndex, position, distance, node.get("name"), "", node);
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/actions/StopImporterAction.java (revision 34718)
@@ -0,0 +1,522 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.actions;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.event.ActionEvent;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.text.DecimalFormat;
+import java.text.Format;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Vector;
+import java.util.zip.GZIPInputStream;
+
+import javax.swing.AbstractAction;
+import javax.swing.Action;
+import javax.swing.DefaultListModel;
+import javax.swing.JFileChooser;
+import javax.swing.JOptionPane;
+import javax.swing.JTable;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxData;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
+import org.openstreetmap.josm.data.osm.visitor.PrimitiveVisitor;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.io.GpxReader;
+import org.openstreetmap.josm.plugins.public_transport.commands.SettingsStoptypeCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistAddCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistDeleteCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistDetachCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistRelocateCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistSortCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackSuggestStopsCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsDetachCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsDisableCommand;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsEnableCommand;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+import org.openstreetmap.josm.spi.preferences.Config;
+import org.xml.sax.SAXException;
+
+/**
+ * Create Stops from GPX
+ */
+public class StopImporterAction extends JosmAction {
+ private static StopImporterDialog dialog = null;
+
+ private static DefaultListModel tracksListModel = null;
+
+ private static GpxData data = null;
+
+ private static TrackReference currentTrack = null;
+
+ private static WaypointTableModel waypointTM = null;
+
+ public boolean inEvent = false;
+
+ /**
+ * Constructs a new {@code StopImporterAction}.
+ */
+ public StopImporterAction() {
+ super(tr("Create Stops from GPX ..."), null, tr("Create Stops from a GPX file"), null,
+ false);
+ putValue("toolbar", "publictransport/stopimporter");
+ MainApplication.getToolbar().register(this);
+ }
+
+ public WaypointTableModel getWaypointTableModel() {
+ return waypointTM;
+ }
+
+ public StopImporterDialog getDialog() {
+ return dialog;
+ }
+
+ public DefaultListModel getTracksListModel() {
+ if (tracksListModel == null)
+ tracksListModel = new DefaultListModel<>();
+ return tracksListModel;
+ }
+
+ public TrackReference getCurrentTrack() {
+ return currentTrack;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent event) {
+ if (dialog == null)
+ dialog = new StopImporterDialog(this);
+
+ dialog.setVisible(true);
+
+ if (tr("Create Stops from GPX ...").equals(event.getActionCommand())) {
+ String curDir = Config.getPref().get("lastDirectory");
+ if (curDir.equals("")) {
+ curDir = ".";
+ }
+ JFileChooser fc = new JFileChooser(new File(curDir));
+ fc.setDialogTitle(tr("Select GPX file"));
+ fc.setMultiSelectionEnabled(false);
+
+ int answer = fc.showOpenDialog(MainApplication.getMainFrame());
+ if (answer != JFileChooser.APPROVE_OPTION)
+ return;
+
+ if (!fc.getCurrentDirectory().getAbsolutePath().equals(curDir))
+ Config.getPref().put("lastDirectory", fc.getCurrentDirectory().getAbsolutePath());
+
+ importData(fc.getSelectedFile());
+
+ refreshData();
+ } else if ("stopImporter.settingsGPSTimeStart".equals(event.getActionCommand())) {
+ if (!inEvent && dialog.gpsTimeStartValid() && currentTrack != null)
+ UndoRedoHandler.getInstance().add(new TrackStoplistRelocateCommand(this));
+ } else if ("stopImporter.settingsStopwatchStart".equals(event.getActionCommand())) {
+ if (!inEvent && dialog.stopwatchStartValid() && currentTrack != null)
+ UndoRedoHandler.getInstance().add(new TrackStoplistRelocateCommand(this));
+ } else if ("stopImporter.settingsTimeWindow".equals(event.getActionCommand())) {
+ if (currentTrack != null)
+ currentTrack.timeWindow = dialog.getTimeWindow();
+ } else if ("stopImporter.settingsThreshold".equals(event.getActionCommand())) {
+ if (currentTrack != null)
+ currentTrack.threshold = dialog.getThreshold();
+ } else if ("stopImporter.settingsSuggestStops".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new TrackSuggestStopsCommand(this));
+ else if ("stopImporter.stoplistFind".equals(event.getActionCommand()))
+ findNodesInTable(dialog.getStoplistTable(), currentTrack.stoplistTM.getNodes());
+ else if ("stopImporter.stoplistShow".equals(event.getActionCommand()))
+ showNodesFromTable(dialog.getStoplistTable(), currentTrack.stoplistTM.getNodes());
+ else if ("stopImporter.stoplistMark".equals(event.getActionCommand()))
+ markNodesFromTable(dialog.getStoplistTable(), currentTrack.stoplistTM.getNodes());
+ else if ("stopImporter.stoplistDetach".equals(event.getActionCommand())) {
+ UndoRedoHandler.getInstance().add(new TrackStoplistDetachCommand(this));
+ dialog.getStoplistTable().clearSelection();
+ } else if ("stopImporter.stoplistAdd".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new TrackStoplistAddCommand(this));
+ else if ("stopImporter.stoplistDelete".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new TrackStoplistDeleteCommand(this));
+ else if ("stopImporter.stoplistSort".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new TrackStoplistSortCommand(this));
+ else if ("stopImporter.waypointsFind".equals(event.getActionCommand()))
+ findNodesInTable(dialog.getWaypointsTable(), waypointTM.nodes);
+ else if ("stopImporter.waypointsShow".equals(event.getActionCommand()))
+ showNodesFromTable(dialog.getWaypointsTable(), waypointTM.nodes);
+ else if ("stopImporter.waypointsMark".equals(event.getActionCommand()))
+ markNodesFromTable(dialog.getWaypointsTable(), waypointTM.nodes);
+ else if ("stopImporter.waypointsDetach".equals(event.getActionCommand())) {
+ UndoRedoHandler.getInstance().add(new WaypointsDetachCommand(this));
+ dialog.getWaypointsTable().clearSelection();
+ } else if ("stopImporter.waypointsAdd".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new WaypointsEnableCommand(this));
+ else if ("stopImporter.waypointsDelete".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new WaypointsDisableCommand(this));
+ else if ("stopImporter.settingsStoptype".equals(event.getActionCommand()))
+ UndoRedoHandler.getInstance().add(new SettingsStoptypeCommand(this));
+ }
+
+ private void importData(final File file) {
+ try {
+ InputStream is;
+ if (file.getName().endsWith(".gpx.gz"))
+ is = new GZIPInputStream(new FileInputStream(file));
+ else
+ is = new FileInputStream(file);
+ // Workaround for SAX BOM bug
+ // https://bugs.openjdk.java.net/browse/JDK-6206835
+ if (!((is.read() == 0xef) && (is.read() == 0xbb) && (is.read() == 0xbf))) {
+ is.close();
+ if (file.getName().endsWith(".gpx.gz"))
+ is = new GZIPInputStream(new FileInputStream(file));
+ else
+ is = new FileInputStream(file);
+ }
+ final GpxReader r = new GpxReader(is);
+ final boolean parsedProperly = r.parse(true);
+ data = r.getGpxData();
+
+ if (!parsedProperly) {
+ JOptionPane.showMessageDialog(null,
+ tr("Error occurred while parsing gpx file {0}. Only a part of the file will be available.",
+ file.getName()));
+ }
+ } catch (FileNotFoundException e) {
+ e.printStackTrace();
+ JOptionPane.showMessageDialog(null, tr("File \"{0}\" does not exist", file.getName()));
+ } catch (SAXException e) {
+ e.printStackTrace();
+ JOptionPane.showMessageDialog(null, tr("Parsing file \"{0}\" failed", file.getName()));
+ } catch (IOException e) {
+ e.printStackTrace();
+ JOptionPane.showMessageDialog(null, tr("IOException \"{0}\" occurred", e.toString()));
+ }
+ }
+
+ private void refreshData() {
+ tracksListModel.clear();
+ if (data != null) {
+ Vector trackRefs = new Vector<>();
+ Iterator trackIter = data.tracks.iterator();
+ while (trackIter.hasNext()) {
+ GpxTrack track = trackIter.next();
+ trackRefs.add(new TrackReference(track, this));
+ }
+
+ Collections.sort(trackRefs);
+
+ Iterator iter = trackRefs.iterator();
+ while (iter.hasNext()) {
+ tracksListModel.addElement(iter.next());
+ }
+
+ waypointTM = new WaypointTableModel(this);
+ Iterator waypointIter = data.waypoints.iterator();
+ while (waypointIter.hasNext()) {
+ WayPoint waypoint = waypointIter.next();
+ waypointTM.addRow(waypoint);
+ }
+ dialog.setWaypointsTableModel(waypointTM);
+ } else {
+ JOptionPane.showMessageDialog(null,
+ tr("The GPX file contained no tracks or waypoints."), tr("No data found"),
+ JOptionPane.ERROR_MESSAGE);
+ }
+ }
+
+ public void tracksSelectionChanged(int selectedPos) {
+ if (selectedPos >= 0) {
+ currentTrack = tracksListModel.elementAt(selectedPos);
+ dialog.setTrackValid(true);
+
+ // Prepare Settings
+ dialog.setSettings(currentTrack.gpsSyncTime, currentTrack.stopwatchStart,
+ currentTrack.timeWindow, currentTrack.threshold);
+
+ // Prepare Stoplist
+ dialog.setStoplistTableModel(tracksListModel.elementAt(selectedPos).stoplistTM);
+ } else {
+ currentTrack = null;
+ dialog.setTrackValid(false);
+ }
+ }
+
+ public Node createNode(LatLon latLon, String name) {
+ return createNode(latLon, dialog.getStoptype(), name);
+ }
+
+ public static Node createNode(LatLon latLon, String type, String name) {
+ Node node = new Node(latLon);
+ setTagsWrtType(node, type);
+ node.put("name", name);
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ if (ds == null) {
+ JOptionPane.showMessageDialog(null,
+ tr("There exists no dataset."
+ + " Try to download data from the server or open an OSM file."),
+ tr("No data found"), JOptionPane.ERROR_MESSAGE);
+
+ return null;
+ }
+ ds.addPrimitive(node);
+ return node;
+ }
+
+ /**
+ * sets the tags of the node according to the type
+ * @param node node
+ * @param type type
+ */
+ public static void setTagsWrtType(Node node, String type) {
+ node.remove("highway");
+ node.remove("railway");
+ if ("bus".equals(type))
+ node.put("highway", "bus_stop");
+ else if ("tram".equals(type))
+ node.put("railway", "tram_stop");
+ else if ("light_rail".equals(type))
+ node.put("railway", "station");
+ else if ("subway".equals(type))
+ node.put("railway", "station");
+ else if ("rail".equals(type))
+ node.put("railway", "station");
+ }
+
+ /**
+ * returns a collection of all selected lines or a collection of all lines otherwise
+ * @param table table
+ * @return all selected lines or a collection of all lines otherwise
+ */
+ public static Vector getConsideredLines(JTable table) {
+ int[] selectedLines = table.getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < table.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+ return consideredLines;
+ }
+
+ /**
+ * marks the table items whose nodes are marked on the map
+ * @param table table
+ * @param nodes nodes
+ */
+ public static void findNodesInTable(JTable table, Vector nodes) {
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ if (ds == null)
+ return;
+
+ table.clearSelection();
+
+ for (int i = 0; i < table.getRowCount(); ++i) {
+ if (nodes.elementAt(i) != null && ds.isSelected(nodes.elementAt(i)))
+ table.addRowSelectionInterval(i, i);
+ }
+ }
+
+ /**
+ * shows the nodes that correspond to the marked lines in the table. If no lines are marked in the table, show all nodes from the vector
+ * @param table table
+ * @param nodes nodes
+ */
+ public static void showNodesFromTable(JTable table, Vector nodes) {
+ BoundingXYVisitor box = new BoundingXYVisitor();
+ Vector consideredLines = getConsideredLines(table);
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ int j = consideredLines.elementAt(i);
+ if (nodes.elementAt(j) != null)
+ nodes.elementAt(j).accept((PrimitiveVisitor) box);
+ }
+ if (box.getBounds() == null)
+ return;
+ box.enlargeBoundingBox();
+ MainApplication.getMap().mapView.zoomTo(box);
+ }
+
+ /**
+ * marks the nodes that correspond to the marked lines in the table. If no lines are marked in the table, mark all nodes from the vector
+ * @param table table
+ * @param nodes nodes
+ */
+ public static void markNodesFromTable(JTable table, Vector nodes) {
+ OsmPrimitive[] osmp = {null};
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ ds.setSelected(osmp);
+ Vector consideredLines = getConsideredLines(table);
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ int j = consideredLines.elementAt(i);
+ if (nodes.elementAt(j) != null)
+ ds.addSelected(nodes.elementAt(j));
+ }
+ }
+
+ public static String timeOf(double t) {
+ t -= Math.floor(t / 24 / 60 / 60) * 24 * 60 * 60;
+
+ int hour = (int) Math.floor(t / 60 / 60);
+ t -= Math.floor(t / 60 / 60) * 60 * 60;
+ int minute = (int) Math.floor(t / 60);
+ t -= Math.floor(t / 60) * 60;
+ double second = t;
+
+ Format format = new DecimalFormat("00");
+ Format formatS = new DecimalFormat("00.###");
+ return (format.format(hour) + ":" + format.format(minute) + ":" + formatS.format(second));
+ }
+
+ public Action getFocusWaypointNameAction() {
+ return new FocusWaypointNameAction();
+ }
+
+ public Action getFocusWaypointShelterAction(String shelter) {
+ return new FocusWaypointShelterAction(shelter);
+ }
+
+ public Action getFocusWaypointDeleteAction() {
+ return new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JTable table = dialog.getWaypointsTable();
+ int row = table.getEditingRow();
+ if (row < 0)
+ return;
+ table.clearSelection();
+ table.addRowSelectionInterval(row, row);
+ UndoRedoHandler.getInstance().add(new WaypointsDisableCommand(StopImporterAction.this));
+ }
+ };
+ }
+
+ public Action getFocusTrackStoplistNameAction() {
+ return new FocusTrackStoplistNameAction();
+ }
+
+ public Action getFocusTrackStoplistShelterAction(String shelter) {
+ return new FocusTrackStoplistShelterAction(shelter);
+ }
+
+ public Action getFocusStoplistDeleteAction() {
+ return new AbstractAction() {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JTable table = dialog.getStoplistTable();
+ int row = table.getEditingRow();
+ if (row < 0)
+ return;
+ table.clearSelection();
+ table.addRowSelectionInterval(row, row);
+ UndoRedoHandler.getInstance().add(new TrackStoplistDeleteCommand(StopImporterAction.this));
+ }
+ };
+ }
+
+ private static class FocusWaypointNameAction extends AbstractAction {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JTable table = dialog.getWaypointsTable();
+ showNodesFromTable(table, waypointTM.nodes);
+ markNodesFromTable(table, waypointTM.nodes);
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ waypointTM.inEvent = true;
+ if (table.getCellEditor() != null) {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 1);
+ table.getCellEditor().getTableCellEditorComponent(table, "", true, row, 1);
+ waypointTM.inEvent = false;
+ }
+ }
+
+ private static class FocusWaypointShelterAction extends AbstractAction {
+ private String defaultShelter = null;
+
+ FocusWaypointShelterAction(String defaultShelter) {
+ this.defaultShelter = defaultShelter;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JTable table = dialog.getWaypointsTable();
+ showNodesFromTable(table, waypointTM.nodes);
+ markNodesFromTable(table, waypointTM.nodes);
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ waypointTM.inEvent = true;
+ if (table.getCellEditor() != null) {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 2);
+ waypointTM.inEvent = false;
+ table.getCellEditor().getTableCellEditorComponent(table, defaultShelter, true, row, 2);
+ }
+ }
+
+ private static class FocusTrackStoplistNameAction extends AbstractAction {
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JTable table = dialog.getStoplistTable();
+ showNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ markNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ currentTrack.inEvent = true;
+ if (table.getCellEditor() != null) {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 1);
+ table.getCellEditor().getTableCellEditorComponent(table, "", true, row, 1);
+ currentTrack.inEvent = false;
+ }
+ }
+
+ private static class FocusTrackStoplistShelterAction extends AbstractAction {
+ private String defaultShelter = null;
+
+ FocusTrackStoplistShelterAction(String defaultShelter) {
+ this.defaultShelter = defaultShelter;
+ }
+
+ @Override
+ public void actionPerformed(ActionEvent e) {
+ JTable table = dialog.getStoplistTable();
+ showNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ markNodesFromTable(table, currentTrack.stoplistTM.getNodes());
+ int row = table.getEditingRow();
+ if (row < 0)
+ row = 0;
+ currentTrack.inEvent = true;
+ if (table.getCellEditor() != null) {
+ if (!table.getCellEditor().stopCellEditing())
+ table.getCellEditor().cancelCellEditing();
+ }
+ table.editCellAt(row, 2);
+ currentTrack.inEvent = false;
+ table.getCellEditor().getTableCellEditorComponent(table, defaultShelter, true, row, 2);
+ }
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/AbstractGTFSCatchJoinCommand.java (revision 34718)
@@ -0,0 +1,117 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.List;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
+
+public abstract class AbstractGTFSCatchJoinCommand extends Command {
+ private List workingLines = null;
+
+ private Node undoMapNode = null;
+
+ private Node undoTableNode = null;
+
+ private GTFSStopTableModel gtfsStopTM = null;
+
+ private String type = null;
+
+ private final boolean isCatch;
+
+ public AbstractGTFSCatchJoinCommand(GTFSImporterAction controller, boolean isCatch) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ gtfsStopTM = controller.getGTFSStopTableModel();
+ workingLines = new ArrayList<>();
+ this.isCatch = isCatch;
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getGTFSStopTable().getSelectedRows();
+ if (selectedLines.length != 1)
+ return;
+ workingLines.add(selectedLines[0]);
+ }
+
+ @Override
+ public boolean executeCommand() {
+ if (workingLines.size() != 1)
+ return false;
+ Node dest = null;
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ Iterator iter = ds.getSelectedNodes().iterator();
+ int j = workingLines.get(0);
+ while (iter.hasNext()) {
+ Node n = iter.next();
+ if (n != null && n.equals(gtfsStopTM.nodes.elementAt(j)))
+ continue;
+ if (dest != null)
+ return false;
+ dest = n;
+ }
+ if (dest == null)
+ return false;
+ undoMapNode = new Node(dest);
+
+ Node node = gtfsStopTM.nodes.elementAt(j);
+ undoTableNode = node;
+ if (node != null) {
+ ds.removePrimitive(node);
+ node.setDeleted(true);
+ }
+
+ if (isCatch)
+ dest.setCoor(gtfsStopTM.coors.elementAt(j));
+ dest.put("highway", "bus_stop");
+ dest.put("stop_id", (String) gtfsStopTM.getValueAt(j, 0));
+ if (dest.get("name") == null)
+ dest.put("name", (String) gtfsStopTM.getValueAt(j, 1));
+ if (isCatch)
+ dest.put("note", "moved by gtfs import");
+ gtfsStopTM.nodes.set(j, dest);
+ type = (String) gtfsStopTM.getValueAt(j, 2);
+ gtfsStopTM.setValueAt(isCatch ? "fed" : tr("moved"), j, 2);
+
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ if (workingLines.size() != 1)
+ return;
+ int j = workingLines.get(0);
+
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ Node node = gtfsStopTM.nodes.elementAt(j);
+ if (node != null) {
+ ds.removePrimitive(node);
+ node.setDeleted(true);
+ }
+
+ if (undoMapNode != null) {
+ undoMapNode.setDeleted(false);
+ ds.addPrimitive(undoMapNode);
+ }
+ if (undoTableNode != null) {
+ undoTableNode.setDeleted(false);
+ ds.addPrimitive(undoTableNode);
+ }
+ gtfsStopTM.nodes.set(j, undoTableNode);
+ gtfsStopTM.setValueAt(type, j, 2);
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ // Do nothing
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSAddCommand.java (revision 34718)
@@ -0,0 +1,89 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
+
+public class GTFSAddCommand extends Command {
+ private Vector workingLines = null;
+
+ private Vector typesForUndo = null;
+
+ private GTFSStopTableModel gtfsStopTM = null;
+
+ private String type = null;
+
+ public GTFSAddCommand(GTFSImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ gtfsStopTM = controller.getGTFSStopTableModel();
+ type = controller.getDialog().getStoptype();
+ workingLines = new Vector<>();
+ typesForUndo = new Vector<>();
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getGTFSStopTable().getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < gtfsStopTM.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+
+ // keep only lines where a node can be added
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ if (gtfsStopTM.nodes.elementAt(consideredLines.elementAt(i)) == null)
+ workingLines.add(consideredLines.elementAt(i));
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ typesForUndo.clear();
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ typesForUndo.add((String) gtfsStopTM.getValueAt(j, 2));
+ Node node = GTFSImporterAction.createNode(gtfsStopTM.coors.elementAt(j),
+ (String) gtfsStopTM.getValueAt(j, 0), (String) gtfsStopTM.getValueAt(j, 1));
+ gtfsStopTM.nodes.set(j, node);
+ gtfsStopTM.setValueAt(tr("added"), j, 2);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = gtfsStopTM.nodes.elementAt(j);
+ gtfsStopTM.nodes.set(j, null);
+ gtfsStopTM.setValueAt(typesForUndo.elementAt(i), j, 2);
+ if (node == null)
+ continue;
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Enable GTFSStops");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSCatchCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSCatchCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSCatchCommand.java (revision 34718)
@@ -0,0 +1,18 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+
+public class GTFSCatchCommand extends AbstractGTFSCatchJoinCommand {
+
+ public GTFSCatchCommand(GTFSImporterAction controller) {
+ super(controller, true);
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Catch GTFS stops");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSDeleteCommand.java (revision 34718)
@@ -0,0 +1,94 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
+
+public class GTFSDeleteCommand extends Command {
+ private Vector workingLines = null;
+
+ private Vector nodesForUndo = null;
+
+ private Vector typesForUndo = null;
+
+ private GTFSStopTableModel gtfsStopTM = null;
+
+ public GTFSDeleteCommand(GTFSImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ gtfsStopTM = controller.getGTFSStopTableModel();
+ workingLines = new Vector<>();
+ nodesForUndo = new Vector<>();
+ typesForUndo = new Vector<>();
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getGTFSStopTable().getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < gtfsStopTM.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+
+ // keep only lines where a node can be added
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ if (gtfsStopTM.nodes.elementAt(consideredLines.elementAt(i)) != null)
+ workingLines.add(consideredLines.elementAt(i));
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ nodesForUndo.clear();
+ typesForUndo.clear();
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = gtfsStopTM.nodes.elementAt(j);
+ nodesForUndo.add(node);
+ typesForUndo.add((String) gtfsStopTM.getValueAt(j, 2));
+ if (node == null)
+ continue;
+ gtfsStopTM.nodes.set(j, null);
+ gtfsStopTM.setValueAt(tr("skipped"), j, 2);
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = nodesForUndo.elementAt(i);
+ gtfsStopTM.nodes.set(j, node);
+ gtfsStopTM.setValueAt(typesForUndo.elementAt(i), j, 2);
+ if (node == null)
+ continue;
+ node.setDeleted(false);
+ MainApplication.getLayerManager().getEditDataSet().addPrimitive(node);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Disable GTFS");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSJoinCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSJoinCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/GTFSJoinCommand.java (revision 34718)
@@ -0,0 +1,18 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+
+public class GTFSJoinCommand extends AbstractGTFSCatchJoinCommand {
+
+ public GTFSJoinCommand(GTFSImporterAction controller) {
+ super(controller, false);
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Join GTFS stops");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/SettingsStoptypeCommand.java (revision 34718)
@@ -0,0 +1,91 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import javax.swing.DefaultListModel;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+
+public class SettingsStoptypeCommand extends Command {
+ private static class HighwayRailway {
+ HighwayRailway(Node node) {
+ this.node = node;
+ highway = node.get("highway");
+ railway = node.get("railway");
+ }
+
+ public Node node;
+
+ public String highway;
+
+ public String railway;
+ }
+
+ private Vector oldStrings = null;
+
+ private WaypointTableModel waypointTM = null;
+
+ private DefaultListModel tracksListModel = null;
+
+ private String type = null;
+
+ public SettingsStoptypeCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ waypointTM = controller.getWaypointTableModel();
+ tracksListModel = controller.getTracksListModel();
+ type = controller.getDialog().getStoptype();
+ oldStrings = new Vector<>();
+ }
+
+ @Override
+ public boolean executeCommand() {
+ oldStrings.clear();
+ for (int i = 0; i < waypointTM.getRowCount(); ++i) {
+ if (waypointTM.nodes.elementAt(i) != null) {
+ Node node = waypointTM.nodes.elementAt(i);
+ oldStrings.add(new HighwayRailway(node));
+ StopImporterAction.setTagsWrtType(node, type);
+ }
+ }
+ for (int j = 0; j < tracksListModel.size(); ++j) {
+ TrackReference track = (TrackReference) tracksListModel.elementAt(j);
+ for (int i = 0; i < track.stoplistTM.getRowCount(); ++i) {
+ if (track.stoplistTM.nodeAt(i) != null) {
+ Node node = track.stoplistTM.nodeAt(i);
+ oldStrings.add(new HighwayRailway(node));
+ StopImporterAction.setTagsWrtType(node, type);
+ }
+ }
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < oldStrings.size(); ++i) {
+ HighwayRailway hr = oldStrings.elementAt(i);
+ hr.node.put("highway", hr.highway);
+ hr.node.put("railway", hr.railway);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Change stop type");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistAddCommand.java (revision 34718)
@@ -0,0 +1,48 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+
+public class TrackStoplistAddCommand extends Command {
+ private int workingLine;
+
+ private TrackStoplistTableModel stoplistTM = null;
+
+ public TrackStoplistAddCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ stoplistTM = controller.getCurrentTrack().stoplistTM;
+ workingLine = controller.getDialog().getStoplistTable().getSelectedRow();
+ }
+
+ @Override
+ public boolean executeCommand() {
+ stoplistTM.insertRow(workingLine, "00:00:00");
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ int workingLine = this.workingLine;
+ if (workingLine < 0)
+ workingLine = stoplistTM.getRowCount() - 1;
+ stoplistTM.removeRow(workingLine);
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Add track stop");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDeleteCommand.java (revision 34718)
@@ -0,0 +1,99 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+
+public class TrackStoplistDeleteCommand extends Command {
+ private static class NodeTimeName {
+ NodeTimeName(Node node, String time, String name, TransText shelter) {
+ this.node = node;
+ this.time = time;
+ this.name = name;
+ this.shelter = shelter;
+ }
+
+ public Node node;
+
+ public String time;
+
+ public String name;
+
+ public TransText shelter;
+ }
+
+ private Vector workingLines = null;
+
+ private Vector nodesForUndo = null;
+
+ private TrackStoplistTableModel stoplistTM = null;
+
+ public TrackStoplistDeleteCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ stoplistTM = controller.getCurrentTrack().stoplistTM;
+ workingLines = new Vector<>();
+ nodesForUndo = new Vector<>();
+
+ // use selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getStoplistTable().getSelectedRows();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ workingLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < stoplistTM.getRowCount(); ++i) {
+ workingLines.add(Integer.valueOf(i));
+ }
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ nodesForUndo.clear();
+ for (int i = workingLines.size() - 1; i >= 0; --i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = stoplistTM.nodeAt(j);
+ nodesForUndo.add(new NodeTimeName(node, (String) stoplistTM.getValueAt(j, 0),
+ (String) stoplistTM.getValueAt(j, 1), (TransText) stoplistTM.getValueAt(j, 2)));
+ stoplistTM.removeRow(j);
+ if (node == null)
+ continue;
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ NodeTimeName ntn = nodesForUndo.elementAt(workingLines.size() - i - 1);
+ stoplistTM.insertRow(j, ntn.node, ntn.time, ntn.name, ntn.shelter);
+ if (ntn.node == null)
+ continue;
+ ntn.node.setDeleted(false);
+ MainApplication.getLayerManager().getEditDataSet().addPrimitive(ntn.node);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Delete track stop");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistDetachCommand.java (revision 34718)
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+
+public class TrackStoplistDetachCommand extends Command {
+ private Vector workingLines = null;
+
+ private Vector nodesForUndo = null;
+
+ private TrackStoplistTableModel stoplistTM = null;
+
+ public TrackStoplistDetachCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ stoplistTM = controller.getCurrentTrack().stoplistTM;
+ workingLines = new Vector<>();
+ nodesForUndo = new Vector<>();
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getStoplistTable().getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < stoplistTM.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+
+ // keep only lines where a node can be added
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ if (stoplistTM.nodeAt(consideredLines.elementAt(i)) != null)
+ workingLines.add(consideredLines.elementAt(i));
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ nodesForUndo.clear();
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = stoplistTM.nodeAt(j);
+ nodesForUndo.add(node);
+ stoplistTM.setNodeAt(j, null);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = nodesForUndo.elementAt(i);
+ stoplistTM.setNodeAt(j, node);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Detach track stop list");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistNameCommand.java (revision 34718)
@@ -0,0 +1,107 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+
+public class TrackStoplistNameCommand extends Command {
+ private int workingLine = 0;
+
+ private TrackReference trackref = null;
+
+ private String oldName = null;
+
+ private String name = null;
+
+ private String oldTime = null;
+
+ private String time = null;
+
+ private String oldShelter = null;
+
+ private TransText shelter = null;
+
+ private LatLon oldLatLon = null;
+
+ public TrackStoplistNameCommand(TrackReference trackref, int workingLine) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ this.trackref = trackref;
+ this.workingLine = workingLine;
+ Node node = trackref.stoplistTM.nodeAt(workingLine);
+ if (node != null) {
+ oldName = node.get("name");
+ oldTime = trackref.stoplistTM.timeAt(workingLine);
+ oldShelter = node.get("shelter");
+ oldLatLon = node.getCoor();
+ }
+ this.time = (String) trackref.stoplistTM.getValueAt(workingLine, 0);
+ this.name = (String) trackref.stoplistTM.getValueAt(workingLine, 1);
+ this.shelter = (TransText) trackref.stoplistTM.getValueAt(workingLine, 2);
+ if ("".equals(this.shelter.text))
+ this.shelter = null;
+ }
+
+ @Override
+ public boolean executeCommand() {
+ Node node = trackref.stoplistTM.nodeAt(workingLine);
+ if (node != null) {
+ node.put("name", name);
+ node.put("shelter", shelter.text);
+ double dTime = StopImporterDialog.parseTime(time);
+ node.setCoor(trackref.computeCoor(dTime));
+ }
+ trackref.inEvent = true;
+ if (time == null)
+ trackref.stoplistTM.setValueAt("", workingLine, 0);
+ else
+ trackref.stoplistTM.setValueAt(time, workingLine, 0);
+ if (name == null)
+ trackref.stoplistTM.setValueAt("", workingLine, 1);
+ else
+ trackref.stoplistTM.setValueAt(name, workingLine, 1);
+ trackref.stoplistTM.setValueAt(shelter, workingLine, 2);
+ trackref.inEvent = false;
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ Node node = trackref.stoplistTM.nodeAt(workingLine);
+ if (node != null) {
+ node.put("name", oldName);
+ node.put("shelter", oldShelter);
+ node.setCoor(oldLatLon);
+ }
+ trackref.inEvent = true;
+ if (oldTime == null)
+ trackref.stoplistTM.setValueAt("", workingLine, 0);
+ else
+ trackref.stoplistTM.setValueAt(oldTime, workingLine, 0);
+ if (oldName == null)
+ trackref.stoplistTM.setValueAt("", workingLine, 1);
+ else
+ trackref.stoplistTM.setValueAt(oldName, workingLine, 1);
+ trackref.stoplistTM.setValueAt(new TransText(oldShelter), workingLine, 2);
+ trackref.inEvent = false;
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Edit track stop list");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistRelocateCommand.java (revision 34718)
@@ -0,0 +1,92 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+
+public class TrackStoplistRelocateCommand extends Command {
+ private StopImporterAction controller = null;
+
+ private TrackReference currentTrack = null;
+
+ private String oldGpsSyncTime = null;
+
+ private String oldStopwatchStart = null;
+
+ private String gpsSyncTime = null;
+
+ private String stopwatchStart = null;
+
+ public TrackStoplistRelocateCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ this.controller = controller;
+ this.currentTrack = controller.getCurrentTrack();
+ this.gpsSyncTime = controller.getDialog().getGpsTimeStart();
+ this.stopwatchStart = controller.getDialog().getStopwatchStart();
+ this.oldGpsSyncTime = currentTrack.gpsSyncTime;
+ this.oldStopwatchStart = currentTrack.stopwatchStart;
+ }
+
+ @Override
+ public boolean executeCommand() {
+ currentTrack.gpsSyncTime = gpsSyncTime;
+ currentTrack.stopwatchStart = stopwatchStart;
+ for (int i = 0; i < currentTrack.stoplistTM.getNodes().size(); ++i) {
+ Node node = currentTrack.stoplistTM.nodeAt(i);
+ if (node == null)
+ continue;
+
+ double time = StopImporterDialog
+ .parseTime((String) currentTrack.stoplistTM.getValueAt(i, 0));
+ node.setCoor(currentTrack.computeCoor(time));
+ }
+ if (currentTrack == controller.getCurrentTrack()) {
+ controller.inEvent = true;
+ controller.getDialog().setGpsTimeStart(gpsSyncTime);
+ controller.getDialog().setStopwatchStart(stopwatchStart);
+ controller.inEvent = false;
+ }
+
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ currentTrack.gpsSyncTime = oldGpsSyncTime;
+ currentTrack.stopwatchStart = oldStopwatchStart;
+ for (int i = 0; i < currentTrack.stoplistTM.getNodes().size(); ++i) {
+ Node node = currentTrack.stoplistTM.nodeAt(i);
+ if (node == null)
+ continue;
+
+ double time = StopImporterDialog
+ .parseTime((String) currentTrack.stoplistTM.getValueAt(i, 0));
+ node.setCoor(currentTrack.computeCoor(time));
+ }
+ if (currentTrack == controller.getCurrentTrack()) {
+ controller.inEvent = true;
+ controller.getDialog().setGpsTimeStart(oldGpsSyncTime);
+ controller.getDialog().setStopwatchStart(oldStopwatchStart);
+ controller.inEvent = false;
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Relocate nodes in track stoplist");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackStoplistSortCommand.java (revision 34718)
@@ -0,0 +1,139 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+
+public class TrackStoplistSortCommand extends Command {
+ private TrackStoplistTableModel stoplistTM = null;
+
+ private Vector> tableDataModel = null;
+
+ private Vector nodes = null;
+
+ private Vector times = null;
+
+ private Vector workingLines = null;
+
+ private int insPos;
+
+ private String stopwatchStart;
+
+ public TrackStoplistSortCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ stoplistTM = controller.getCurrentTrack().stoplistTM;
+ workingLines = new Vector<>();
+ insPos = controller.getDialog().getStoplistTable().getSelectedRow();
+ stopwatchStart = controller.getCurrentTrack().stopwatchStart;
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getStoplistTable().getSelectedRows();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ workingLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < stoplistTM.getRowCount(); ++i) {
+ workingLines.add(Integer.valueOf(i));
+ }
+ }
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public boolean executeCommand() {
+ tableDataModel = (Vector>) stoplistTM.getDataVector().clone();
+ nodes = (Vector) stoplistTM.getNodes().clone();
+ times = (Vector) stoplistTM.getTimes().clone();
+
+ Vector nodesToSort = new Vector<>();
+ for (int i = workingLines.size() - 1; i >= 0; --i) {
+ int j = workingLines.elementAt(i).intValue();
+ nodesToSort.add(new NodeSortEntry(stoplistTM.nodeAt(j),
+ (String) stoplistTM.getValueAt(j, 0), (String) stoplistTM.getValueAt(j, 1),
+ (TransText) stoplistTM.getValueAt(j, 2),
+ StopImporterDialog.parseTime(stopwatchStart)));
+ stoplistTM.removeRow(j);
+ }
+
+ Collections.sort(nodesToSort);
+
+ int insPos = this.insPos;
+ Iterator iter = nodesToSort.iterator();
+ while (iter.hasNext()) {
+ NodeSortEntry nse = iter.next();
+ stoplistTM.insertRow(insPos, nse.node, nse.time, nse.name, nse.shelter);
+ if (insPos >= 0)
+ ++insPos;
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ stoplistTM.setDataVector(tableDataModel);
+ stoplistTM.setNodes(nodes);
+ stoplistTM.setTimes(times);
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: sort track stop list");
+ }
+
+ private static class NodeSortEntry implements Comparable {
+ public Node node = null;
+
+ public String time = null;
+
+ public String name = null;
+
+ public TransText shelter = null;
+
+ public double startTime = 0;
+
+ NodeSortEntry(Node node, String time, String name, TransText shelter,
+ double startTime) {
+ this.node = node;
+ this.time = time;
+ this.name = name;
+ this.shelter = shelter;
+ }
+
+ @Override
+ public int compareTo(NodeSortEntry nse) {
+ double time = StopImporterDialog.parseTime(this.time);
+ if (time - startTime > 12 * 60 * 60)
+ time -= 24 * 60 * 60;
+
+ double nseTime = StopImporterDialog.parseTime(nse.time);
+ if (nseTime - startTime > 12 * 60 * 60)
+ nseTime -= 24 * 60 * 60;
+
+ if (time < nseTime)
+ return -1;
+ else if (time > nseTime)
+ return 1;
+ else
+ return 0;
+ }
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/TrackSuggestStopsCommand.java (revision 34718)
@@ -0,0 +1,240 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+
+public class TrackSuggestStopsCommand extends Command {
+ private TrackStoplistTableModel stoplistTM = null;
+
+ private String type = null;
+
+ private String stopwatchStart;
+
+ private String gpsStartTime;
+
+ private String gpsSyncTime;
+
+ private double timeWindow;
+
+ private double threshold;
+
+ private Collection segments = null;
+
+ private Vector> tableDataModel = null;
+
+ private Vector nodes = null;
+
+ private Vector times = null;
+
+ public TrackSuggestStopsCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ if (controller.getCurrentTrack() == null)
+ return;
+ stoplistTM = controller.getCurrentTrack().stoplistTM;
+ type = controller.getDialog().getStoptype();
+ stopwatchStart = controller.getCurrentTrack().stopwatchStart;
+ gpsStartTime = controller.getCurrentTrack().gpsStartTime;
+ gpsSyncTime = controller.getCurrentTrack().gpsSyncTime;
+ timeWindow = controller.getCurrentTrack().timeWindow;
+ threshold = controller.getCurrentTrack().threshold;
+ segments = controller.getCurrentTrack().getGpxTrack().getSegments();
+ }
+
+ @Override
+ @SuppressWarnings("unchecked")
+ public boolean executeCommand() {
+ if (stoplistTM == null)
+ return false;
+ tableDataModel = (Vector>) stoplistTM.getDataVector().clone();
+ nodes = (Vector) stoplistTM.getNodes().clone();
+ times = (Vector) stoplistTM.getTimes().clone();
+
+ for (int i = 0; i < stoplistTM.getNodes().size(); ++i) {
+ Node node = stoplistTM.nodeAt(i);
+ if (node == null)
+ continue;
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+ stoplistTM.clear();
+
+ Vector wayPoints = new Vector<>();
+ Iterator siter = segments.iterator();
+ while (siter.hasNext()) {
+ Iterator witer = siter.next().getWayPoints().iterator();
+ while (witer.hasNext()) {
+ wayPoints.add(witer.next());
+ }
+ }
+ Vector wayPointsDist = new Vector<>(wayPoints.size());
+
+ int i = 0;
+ double time = -48 * 60 * 60;
+ double dGpsStartTime = StopImporterDialog.parseTime(gpsStartTime);
+ while ((i < wayPoints.size()) && (time < dGpsStartTime + timeWindow / 2)) {
+ if (wayPoints.elementAt(i).getString("time") != null)
+ time = StopImporterDialog
+ .parseTime(wayPoints.elementAt(i).getString("time").substring(11, 19));
+ if (time < dGpsStartTime)
+ time += 24 * 60 * 60;
+ wayPointsDist.add(Double.valueOf(Double.POSITIVE_INFINITY));
+ ++i;
+ }
+ while (i < wayPoints.size()) {
+ int j = i;
+ double time2 = time;
+ while ((j > 0) && (time - timeWindow / 2 < time2)) {
+ --j;
+ if (wayPoints.elementAt(j).getString("time") != null)
+ time2 = StopImporterDialog
+ .parseTime(wayPoints.elementAt(j).getString("time").substring(11, 19));
+ if (time2 < dGpsStartTime)
+ time2 += 24 * 60 * 60;
+ }
+ int k = i + 1;
+ time2 = time;
+ while ((k < wayPoints.size()) && (time + timeWindow / 2 > time2)) {
+ if (wayPoints.elementAt(k).getString("time") != null)
+ time2 = StopImporterDialog
+ .parseTime(wayPoints.elementAt(k).getString("time").substring(11, 19));
+ if (time2 < dGpsStartTime)
+ time2 += 24 * 60 * 60;
+ ++k;
+ }
+
+ if (j < k) {
+ double dist = 0;
+ LatLon latLonI = wayPoints.elementAt(i).getCoor();
+ for (int l = j; l < k; ++l) {
+ double distL = latLonI.greatCircleDistance(wayPoints.elementAt(l).getCoor());
+ if (distL > dist)
+ dist = distL;
+ }
+ wayPointsDist.add(Double.valueOf(dist));
+ } else
+ wayPointsDist.add(Double.valueOf(Double.POSITIVE_INFINITY));
+
+ if (wayPoints.elementAt(i).getString("time") != null)
+ time = StopImporterDialog
+ .parseTime(wayPoints.elementAt(i).getString("time").substring(11, 19));
+ if (time < dGpsStartTime)
+ time += 24 * 60 * 60;
+ ++i;
+ }
+
+ LatLon lastStopCoor = null;
+ for (i = 1; i < wayPoints.size() - 1; ++i) {
+ if (wayPointsDist.elementAt(i).doubleValue() >= threshold)
+ continue;
+ if ((wayPointsDist.elementAt(i).compareTo(wayPointsDist.elementAt(i - 1)) != -1)
+ || (wayPointsDist.elementAt(i).compareTo(wayPointsDist.elementAt(i + 1)) != -1))
+ continue;
+
+ LatLon latLon = wayPoints.elementAt(i).getCoor();
+ if ((lastStopCoor != null) && (lastStopCoor.greatCircleDistance(latLon) < threshold))
+ continue;
+
+ if (wayPoints.elementAt(i).getString("time") != null) {
+ time = StopImporterDialog
+ .parseTime(wayPoints.elementAt(i).getString("time").substring(11, 19));
+ double gpsSyncTime = StopImporterDialog.parseTime(this.gpsSyncTime);
+ if (gpsSyncTime < dGpsStartTime - 12 * 60 * 60)
+ gpsSyncTime += 24 * 60 * 60;
+ double timeDelta = gpsSyncTime - StopImporterDialog.parseTime(stopwatchStart);
+ time -= timeDelta;
+ Node node = StopImporterAction.createNode(latLon, type, "");
+ stoplistTM.insertRow(-1, node, StopImporterAction.timeOf(time), "",
+ new TransText(null));
+ }
+
+ lastStopCoor = latLon;
+ }
+
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ if (stoplistTM == null)
+ return;
+ for (int i = 0; i < stoplistTM.getNodes().size(); ++i) {
+ Node node = stoplistTM.nodeAt(i);
+ if (node == null)
+ continue;
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+
+ stoplistTM.setDataVector(tableDataModel);
+ stoplistTM.setNodes(nodes);
+ stoplistTM.setTimes(times);
+
+ for (int i = 0; i < stoplistTM.getNodes().size(); ++i) {
+ Node node = stoplistTM.nodeAt(i);
+ if (node == null)
+ continue;
+ node.setDeleted(false);
+ MainApplication.getLayerManager().getEditDataSet().addPrimitive(node);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Suggest stops");
+ }
+/*
+ private class NodeSortEntry implements Comparable {
+ public Node node = null;
+
+ public String time = null;
+
+ public String name = null;
+
+ public double startTime = 0;
+
+ public NodeSortEntry(Node node, String time, String name, double startTime) {
+ this.node = node;
+ this.time = time;
+ this.name = name;
+ }
+
+ @Override
+ public int compareTo(NodeSortEntry nse) {
+ double time = StopImporterDialog.parseTime(this.time);
+ if (time - startTime > 12 * 60 * 60)
+ time -= 24 * 60 * 60;
+
+ double nseTime = StopImporterDialog.parseTime(nse.time);
+ if (nseTime - startTime > 12 * 60 * 60)
+ nseTime -= 24 * 60 * 60;
+
+ if (time < nseTime)
+ return -1;
+ else if (time > nseTime)
+ return 1;
+ else
+ return 0;
+ }
+ }*/
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDetachCommand.java (revision 34718)
@@ -0,0 +1,79 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+
+public class WaypointsDetachCommand extends Command {
+ private Vector workingLines = null;
+
+ private Vector nodesForUndo = null;
+
+ private WaypointTableModel waypointTM = null;
+
+ public WaypointsDetachCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ waypointTM = controller.getWaypointTableModel();
+ workingLines = new Vector<>();
+ nodesForUndo = new Vector<>();
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getWaypointsTable().getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < waypointTM.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+
+ // keep only lines where a node can be added
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ if (waypointTM.nodes.elementAt(consideredLines.elementAt(i)) != null)
+ workingLines.add(consideredLines.elementAt(i));
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ nodesForUndo.clear();
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = waypointTM.nodes.elementAt(j);
+ nodesForUndo.add(node);
+ waypointTM.nodes.set(j, null);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = nodesForUndo.elementAt(i);
+ waypointTM.nodes.set(j, node);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Detach waypoints");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsDisableCommand.java (revision 34718)
@@ -0,0 +1,87 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+
+public class WaypointsDisableCommand extends Command {
+ private Vector workingLines = null;
+
+ private Vector nodesForUndo = null;
+
+ private WaypointTableModel waypointTM = null;
+
+ public WaypointsDisableCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ waypointTM = controller.getWaypointTableModel();
+ workingLines = new Vector<>();
+ nodesForUndo = new Vector<>();
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getWaypointsTable().getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < waypointTM.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+
+ // keep only lines where a node can be added
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ if (waypointTM.nodes.elementAt(consideredLines.elementAt(i)) != null)
+ workingLines.add(consideredLines.elementAt(i));
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ nodesForUndo.clear();
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = waypointTM.nodes.elementAt(j);
+ nodesForUndo.add(node);
+ if (node == null)
+ continue;
+ waypointTM.nodes.set(j, null);
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = nodesForUndo.elementAt(i);
+ waypointTM.nodes.set(j, node);
+ if (node == null)
+ continue;
+ node.setDeleted(false);
+ MainApplication.getLayerManager().getEditDataSet().addPrimitive(node);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Disable waypoints");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsEnableCommand.java (revision 34718)
@@ -0,0 +1,85 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+import java.util.Vector;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+
+public class WaypointsEnableCommand extends Command {
+ private Vector workingLines = null;
+
+ private WaypointTableModel waypointTM = null;
+
+ private String type = null;
+
+ public WaypointsEnableCommand(StopImporterAction controller) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ waypointTM = controller.getWaypointTableModel();
+ type = controller.getDialog().getStoptype();
+ workingLines = new Vector<>();
+
+ // use either selected lines or all lines if no line is selected
+ int[] selectedLines = controller.getDialog().getWaypointsTable().getSelectedRows();
+ Vector consideredLines = new Vector<>();
+ if (selectedLines.length > 0) {
+ for (int i = 0; i < selectedLines.length; ++i) {
+ consideredLines.add(selectedLines[i]);
+ }
+ } else {
+ for (int i = 0; i < waypointTM.getRowCount(); ++i) {
+ consideredLines.add(Integer.valueOf(i));
+ }
+ }
+
+ // keep only lines where a node can be added
+ for (int i = 0; i < consideredLines.size(); ++i) {
+ if (waypointTM.nodes.elementAt(consideredLines.elementAt(i)) == null)
+ workingLines.add(consideredLines.elementAt(i));
+ }
+ }
+
+ @Override
+ public boolean executeCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = StopImporterAction.createNode(waypointTM.coors.elementAt(j), type,
+ (String) waypointTM.getValueAt(j, 1));
+ TransText shelter = (TransText) waypointTM.getValueAt(j, 2);
+ node.put("shelter", shelter.text);
+ waypointTM.nodes.set(j, node);
+ }
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ for (int i = 0; i < workingLines.size(); ++i) {
+ int j = workingLines.elementAt(i).intValue();
+ Node node = waypointTM.nodes.elementAt(j);
+ waypointTM.nodes.set(j, null);
+ if (node == null)
+ continue;
+ MainApplication.getLayerManager().getEditDataSet().removePrimitive(node);
+ node.setDeleted(true);
+ }
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Enable waypoints");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/commands/WaypointsNameCommand.java (revision 34718)
@@ -0,0 +1,80 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.commands;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Collection;
+
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+
+public class WaypointsNameCommand extends Command {
+ private int workingLine = 0;
+
+ private WaypointTableModel waypointTM = null;
+
+ private String oldName = null;
+
+ private String name = null;
+
+ private String oldShelter = null;
+
+ private TransText shelter;
+
+ public WaypointsNameCommand(WaypointTableModel waypointTM, int workingLine, String name,
+ TransText shelter) {
+ super(MainApplication.getLayerManager().getEditDataSet());
+ this.waypointTM = waypointTM;
+ this.workingLine = workingLine;
+ if (waypointTM.nodes.elementAt(workingLine) != null) {
+ oldName = waypointTM.nodes.elementAt(workingLine).get("name");
+ oldShelter = waypointTM.nodes.elementAt(workingLine).get("shelter");
+ }
+ this.name = name;
+ this.shelter = shelter;
+ }
+
+ @Override
+ public boolean executeCommand() {
+ if (waypointTM.nodes.elementAt(workingLine) != null) {
+ waypointTM.nodes.elementAt(workingLine).put("name", name);
+ waypointTM.nodes.elementAt(workingLine).put("shelter", shelter.text);
+ }
+ waypointTM.inEvent = true;
+ if (name == null)
+ waypointTM.setValueAt("", workingLine, 1);
+ else
+ waypointTM.setValueAt(name, workingLine, 1);
+ waypointTM.setValueAt(shelter, workingLine, 2);
+ waypointTM.inEvent = false;
+ return true;
+ }
+
+ @Override
+ public void undoCommand() {
+ if (waypointTM.nodes.elementAt(workingLine) != null) {
+ waypointTM.nodes.elementAt(workingLine).put("name", oldName);
+ waypointTM.nodes.elementAt(workingLine).put("shelter", oldShelter);
+ }
+ waypointTM.inEvent = true;
+ if (oldName == null)
+ waypointTM.setValueAt("", workingLine, 1);
+ else
+ waypointTM.setValueAt(oldName, workingLine, 1);
+ waypointTM.setValueAt(new TransText(oldShelter), workingLine, 2);
+ waypointTM.inEvent = false;
+ }
+
+ @Override
+ public void fillModifiedData(Collection modified,
+ Collection deleted, Collection added) {
+ }
+
+ @Override
+ public String getDescriptionText() {
+ return tr("Public Transport: Edit waypoint name");
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/AbstractImporterDialog.java (revision 34718)
@@ -0,0 +1,158 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.Frame;
+
+import javax.swing.JComboBox;
+import javax.swing.JDialog;
+import javax.swing.JOptionPane;
+import javax.swing.JTabbedPane;
+import javax.swing.JTextField;
+
+import org.openstreetmap.josm.actions.JosmAction;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+
+/**
+ * Abstract superclass of {@link GTFSImporterDialog} and {@link StopImporterDialog}.
+ */
+public abstract class AbstractImporterDialog {
+
+ private static final String[] stoptypes = new String[] {
+ marktr("bus"),
+ marktr("tram"),
+ marktr("light_rail"),
+ marktr("subway"),
+ marktr("rail") };
+
+ private final JDialog jDialog;
+
+ protected final JTabbedPane tabbedPane;
+
+ protected final JComboBox cbStoptype;
+
+ protected final JTextField tfGPSTimeStart;
+
+ protected final JTextField tfStopwatchStart;
+
+ protected final JTextField tfTimeWindow;
+
+ protected final JTextField tfThreshold;
+
+ public AbstractImporterDialog(T controller, String dialogTitle, String actionPrefix) {
+ Frame frame = JOptionPane.getFrameForComponent(MainApplication.getMainFrame());
+ jDialog = new JDialog(frame, dialogTitle, false);
+ tabbedPane = new JTabbedPane();
+ jDialog.add(tabbedPane);
+
+ cbStoptype = new JComboBox<>();
+ cbStoptype.setEditable(false);
+ for (String type : stoptypes) {
+ cbStoptype.addItem(new TransText(type));
+ }
+ cbStoptype.setActionCommand(actionPrefix + ".settingsStoptype");
+ cbStoptype.addActionListener(controller);
+
+ tfGPSTimeStart = new JTextField("00:00:00", 15);
+ tfGPSTimeStart.setActionCommand(actionPrefix + ".settingsGPSTimeStart");
+ tfGPSTimeStart.addActionListener(controller);
+
+ tfStopwatchStart = new JTextField("00:00:00", 15);
+ tfStopwatchStart.setActionCommand(actionPrefix + ".settingsStopwatchStart");
+ tfStopwatchStart.addActionListener(controller);
+
+ tfTimeWindow = new JTextField("15", 4);
+ tfTimeWindow.setActionCommand(actionPrefix + ".settingsTimeWindow");
+ tfTimeWindow.addActionListener(controller);
+
+ tfThreshold = new JTextField("20", 4);
+ tfThreshold.setActionCommand(actionPrefix + ".settingsThreshold");
+ tfThreshold.addActionListener(controller);
+
+ initDialog(controller);
+
+ jDialog.pack();
+ jDialog.setLocationRelativeTo(frame);
+ }
+
+ protected abstract void initDialog(T controller);
+
+ public void setTrackValid(boolean valid) {
+ tabbedPane.setEnabledAt(2, valid);
+ }
+
+ public void setVisible(boolean visible) {
+ jDialog.setVisible(visible);
+ }
+
+ public void setSettings(String gpsSyncTime, String stopwatchStart, double timeWindow,
+ double threshold) {
+ tfGPSTimeStart.setText(gpsSyncTime);
+ tfStopwatchStart.setText(stopwatchStart);
+ tfTimeWindow.setText(Double.toString(timeWindow));
+ tfThreshold.setText(Double.toString(threshold));
+ }
+
+ public String getStoptype() {
+ return ((TransText) cbStoptype.getSelectedItem()).text;
+ }
+
+ public boolean gpsTimeStartValid() {
+ if (parseTime(tfGPSTimeStart.getText()) >= 0) {
+ return true;
+ } else {
+ JOptionPane.showMessageDialog(null, tr("Can''t parse a time from this string."),
+ tr("Invalid value"), JOptionPane.ERROR_MESSAGE);
+ return false;
+ }
+ }
+
+ public String getGpsTimeStart() {
+ return tfGPSTimeStart.getText();
+ }
+
+ public void setGpsTimeStart(String s) {
+ tfGPSTimeStart.setText(s);
+ }
+
+ public boolean stopwatchStartValid() {
+ if (parseTime(tfStopwatchStart.getText()) >= 0) {
+ return true;
+ } else {
+ JOptionPane.showMessageDialog(null, tr("Can''t parse a time from this string."),
+ tr("Invalid value"), JOptionPane.ERROR_MESSAGE);
+ return false;
+ }
+ }
+
+ public String getStopwatchStart() {
+ return tfStopwatchStart.getText();
+ }
+
+ public void setStopwatchStart(String s) {
+ tfStopwatchStart.setText(s);
+ }
+
+ public double getTimeWindow() {
+ return Double.parseDouble(tfTimeWindow.getText());
+ }
+
+ public double getThreshold() {
+ return Double.parseDouble(tfThreshold.getText());
+ }
+
+ public static double parseTime(String s) {
+ if ((s.charAt(2) != ':') || (s.charAt(5) != ':') || (s.length() < 8))
+ return -1;
+ int hour = Integer.parseInt(s.substring(0, 2));
+ int minute = Integer.parseInt(s.substring(3, 5));
+ double second = Double.parseDouble(s.substring(6, s.length()));
+ if ((hour < 0) || (hour > 23) || (minute < 0) || (minute > 59) || (second < 0)
+ || (second >= 60.0))
+ return -1;
+ return (second + minute * 60 + hour * 60 * 60);
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/GTFSImporterDialog.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/GTFSImporterDialog.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/GTFSImporterDialog.java (revision 34718)
@@ -0,0 +1,368 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.JButton;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.KeyStroke;
+
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.GTFSStopTableModel;
+
+public class GTFSImporterDialog extends AbstractImporterDialog {
+ private final JTable gtfsStopTable = new JTable();
+
+ public GTFSImporterDialog(GTFSImporterAction controller) {
+ super(controller, tr("Create Stops from GTFS"), "gtfsImporter");
+ }
+
+ @Override
+ protected void initDialog(GTFSImporterAction controller) {
+ JPanel tabSettings = new JPanel();
+ tabbedPane.addTab(tr("Settings"), tabSettings);
+ JPanel tabWaypoints = new JPanel();
+ tabbedPane.addTab(tr("GTFS-Stops"), tabWaypoints);
+ tabbedPane.setEnabledAt(0, false);
+ tabbedPane.setEnabledAt(1, true);
+
+ // Settings Tab
+ JPanel contentPane = tabSettings;
+ GridBagLayout gridbag = new GridBagLayout();
+ GridBagConstraints layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ JLabel label = new JLabel(tr("Type of stops to add"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(cbStoptype, layoutCons);
+ contentPane.add(cbStoptype);
+
+ label = new JLabel(tr("Time on your GPS device"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfGPSTimeStart, layoutCons);
+ contentPane.add(tfGPSTimeStart);
+
+ /* I18n: Don't change the time format, you only may translate the letters */
+ label = new JLabel(tr("HH:MM:SS.sss"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ label = new JLabel(tr("Time on your stopwatch"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 4;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 5;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfStopwatchStart, layoutCons);
+ contentPane.add(tfStopwatchStart);
+
+ /* I18n: Don't change the time format, you only may translate the letters */
+ label = new JLabel(tr("HH:MM:SS.sss"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 5;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ label = new JLabel(tr("Time window"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 6;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 7;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfTimeWindow, layoutCons);
+ contentPane.add(tfTimeWindow);
+
+ label = new JLabel(tr("seconds"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 7;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ label = new JLabel(tr("Move Threshold"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 8;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 9;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfThreshold, layoutCons);
+ contentPane.add(tfThreshold);
+
+ label = new JLabel(tr("meters"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 9;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ JButton bSuggestStops = new JButton(tr("Suggest Stops"));
+ bSuggestStops.setActionCommand("gtfsImporter.settingsSuggestStops");
+ bSuggestStops.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 10;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bSuggestStops, layoutCons);
+ contentPane.add(bSuggestStops);
+
+ // Waypoints Tab
+ contentPane = tabWaypoints;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt N"), "gtfsImporter.gtfsStopsFocusAdd");
+ contentPane.getActionMap().put("gtfsImporter.gtfsStopsFocusAdd",
+ controller.getFocusAddAction());
+/* contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put
+ (KeyStroke.getKeyStroke("alt S"), "gtfsImporter.focusShelterYes");
+ contentPane.getActionMap().put
+ ("gtfsImporter.focusShelterYes",
+ controller.getFocusWaypointShelterAction("yes"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put
+ (KeyStroke.getKeyStroke("alt T"), "gtfsImporter.focusShelterNo");
+ contentPane.getActionMap().put
+ ("gtfsImporter.focusShelterNo",
+ controller.getFocusWaypointShelterAction("no"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put
+ (KeyStroke.getKeyStroke("alt U"), "gtfsImporter.focusShelterImplicit");
+ contentPane.getActionMap().put
+ ("gtfsImporter.focusShelterImplicit",
+ controller.getFocusWaypointShelterAction("implicit"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT).put
+ (KeyStroke.getKeyStroke("alt D"), "gtfsImporter.gtfsStopsDelete");
+ contentPane.getActionMap().put
+ ("gtfsImporter.gtfsStopsDelete",
+ controller.getFocusWaypointDeleteAction());*/
+
+ JScrollPane tableSP = new JScrollPane(gtfsStopTable);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 4;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ contentPane.add(tableSP);
+
+ JButton bFind = new JButton(tr("Find"));
+ bFind.setActionCommand("gtfsImporter.gtfsStopsFind");
+ bFind.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bFind, layoutCons);
+ contentPane.add(bFind);
+
+ JButton bShow = new JButton(tr("Show"));
+ bShow.setActionCommand("gtfsImporter.gtfsStopsShow");
+ bShow.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bShow, layoutCons);
+ contentPane.add(bShow);
+
+ JButton bMark = new JButton(tr("Mark"));
+ bMark.setActionCommand("gtfsImporter.gtfsStopsMark");
+ bMark.addActionListener(controller);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bMark, layoutCons);
+ contentPane.add(bMark);
+
+ JButton bCatch = new JButton(tr("Catch"));
+ bCatch.setActionCommand("gtfsImporter.gtfsStopsCatch");
+ bCatch.addActionListener(controller);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bCatch, layoutCons);
+ contentPane.add(bCatch);
+
+ JButton bJoin = new JButton(tr("Join"));
+ bJoin.setActionCommand("gtfsImporter.gtfsStopsJoin");
+ bJoin.addActionListener(controller);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 2;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bJoin, layoutCons);
+ contentPane.add(bJoin);
+
+ JButton bAdd = new JButton(tr("Enable"));
+ bAdd.setActionCommand("gtfsImporter.gtfsStopsAdd");
+ bAdd.addActionListener(controller);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bAdd, layoutCons);
+ contentPane.add(bAdd);
+
+ JButton bDelete = new JButton(tr("Disable"));
+ bDelete.setActionCommand("gtfsImporter.gtfsStopsDelete");
+ bDelete.addActionListener(controller);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDelete, layoutCons);
+ contentPane.add(bDelete);
+ }
+
+ public JTable getGTFSStopTable() {
+ return gtfsStopTable;
+ }
+
+ public void setGTFSStopTableModel(GTFSStopTableModel model) {
+ gtfsStopTable.setModel(model);
+ int width = gtfsStopTable.getPreferredSize().width;
+ gtfsStopTable.getColumnModel().getColumn(0).setPreferredWidth((int) (width * 0.3));
+ gtfsStopTable.getColumnModel().getColumn(1).setPreferredWidth((int) (width * 0.6));
+ gtfsStopTable.getColumnModel().getColumn(2).setPreferredWidth((int) (width * 0.1));
+ }
+
+/* private class TracksLSL implements ListSelectionListener
+ {
+ GTFSImporterAction root = null;
+
+ public TracksLSL(GTFSImporterAction sia)
+ {
+ root = sia;
+ }
+
+ public void valueChanged(ListSelectionEvent e)
+ {
+ int selectedPos = tracksList.getAnchorSelectionIndex();
+ if (tracksList.isSelectedIndex(selectedPos))
+ root.tracksSelectionChanged(selectedPos);
+ else
+ root.tracksSelectionChanged(-1);
+ }
+ };*/
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/StopImporterDialog.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/StopImporterDialog.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/dialogs/StopImporterDialog.java (revision 34718)
@@ -0,0 +1,557 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.dialogs;
+
+import static org.openstreetmap.josm.tools.I18n.marktr;
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.awt.GridBagConstraints;
+import java.awt.GridBagLayout;
+
+import javax.swing.DefaultCellEditor;
+import javax.swing.DefaultListModel;
+import javax.swing.JButton;
+import javax.swing.JComboBox;
+import javax.swing.JComponent;
+import javax.swing.JLabel;
+import javax.swing.JList;
+import javax.swing.JPanel;
+import javax.swing.JScrollPane;
+import javax.swing.JTable;
+import javax.swing.KeyStroke;
+import javax.swing.ListSelectionModel;
+import javax.swing.event.ListSelectionEvent;
+import javax.swing.event.ListSelectionListener;
+
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+import org.openstreetmap.josm.plugins.public_transport.models.WaypointTableModel;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+
+public class StopImporterDialog extends AbstractImporterDialog {
+ private JList tracksList = null;
+
+ private final JTable stoplistTable = new JTable();
+
+ private final JTable waypointTable = new JTable();
+
+ public StopImporterDialog(StopImporterAction controller) {
+ super(controller, tr("Create Stops from GPX"), "stopImporter");
+ }
+
+ @Override
+ protected void initDialog(StopImporterAction controller) {
+ JPanel tabTracks = new JPanel();
+ tabbedPane.addTab(tr("Tracks"), tabTracks);
+ JPanel tabSettings = new JPanel();
+ tabbedPane.addTab(tr("Settings"), tabSettings);
+ JPanel tabStops = new JPanel();
+ tabbedPane.addTab(tr("Stops"), tabStops);
+ JPanel tabWaypoints = new JPanel();
+ tabbedPane.addTab(tr("Waypoints"), tabWaypoints);
+ tabbedPane.setEnabledAt(0, true);
+ tabbedPane.setEnabledAt(1, true);
+ tabbedPane.setEnabledAt(2, false);
+ tabbedPane.setEnabledAt(3, true);
+
+ // Tracks Tab
+ JPanel contentPane = tabTracks;
+ GridBagLayout gridbag = new GridBagLayout();
+ GridBagConstraints layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ JLabel label = new JLabel(tr("Tracks in this GPX file:"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ DefaultListModel tracksListModel = controller.getTracksListModel();
+ tracksList = new JList<>(tracksListModel);
+ JScrollPane rpListSP = new JScrollPane(tracksList);
+ String[] data = {"1", "2", "3", "4", "5", "6"};
+ tracksListModel.copyInto(data);
+ tracksList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION);
+ tracksList.addListSelectionListener(new TracksLSL(controller));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(rpListSP, layoutCons);
+ contentPane.add(rpListSP);
+
+ // Settings Tab
+ contentPane = tabSettings;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+
+ label = new JLabel(tr("Type of stops to add"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(cbStoptype, layoutCons);
+ contentPane.add(cbStoptype);
+
+ label = new JLabel(tr("Time on your GPS device"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfGPSTimeStart, layoutCons);
+ contentPane.add(tfGPSTimeStart);
+
+ label = new JLabel(tr("HH:MM:SS.sss"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 3;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ label = new JLabel(tr("Time on your stopwatch"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 4;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 5;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfStopwatchStart, layoutCons);
+ contentPane.add(tfStopwatchStart);
+
+ label = new JLabel(tr("HH:MM:SS.sss"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 5;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ label = new JLabel(tr("Time window"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 6;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 7;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfTimeWindow, layoutCons);
+ contentPane.add(tfTimeWindow);
+
+ label = new JLabel(tr("seconds"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 7;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ label = new JLabel(tr("Move Threshold"));
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 8;
+ layoutCons.gridwidth = 2;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 9;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tfThreshold, layoutCons);
+ contentPane.add(tfThreshold);
+
+ label = new JLabel(tr("meters"));
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 9;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 0.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(label, layoutCons);
+ contentPane.add(label);
+
+ JButton bSuggestStops = new JButton(tr("Suggest Stops"));
+ bSuggestStops.setActionCommand("stopImporter.settingsSuggestStops");
+ bSuggestStops.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 10;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bSuggestStops, layoutCons);
+ contentPane.add(bSuggestStops);
+
+ // Stops Tab
+ contentPane = tabStops;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt N"), "stopImporter.focusName");
+ contentPane.getActionMap().put("stopImporter.focusName",
+ controller.getFocusTrackStoplistNameAction());
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt S"), "stopImporter.focusShelterYes");
+ contentPane.getActionMap().put("stopImporter.focusShelterYes",
+ controller.getFocusTrackStoplistShelterAction("yes"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt T"), "stopImporter.focusShelterNo");
+ contentPane.getActionMap().put("stopImporter.focusShelterNo",
+ controller.getFocusTrackStoplistShelterAction("no"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt U"), "stopImporter.focusShelterImplicit");
+ contentPane.getActionMap().put("stopImporter.focusShelterImplicit",
+ controller.getFocusTrackStoplistShelterAction("implicit"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt D"), "stopImporter.stoplistDelete");
+ contentPane.getActionMap().put("stopImporter.stoplistDelete",
+ controller.getFocusStoplistDeleteAction());
+
+ JScrollPane tableSP = new JScrollPane(stoplistTable);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 4;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ contentPane.add(tableSP);
+
+ JButton bFind = new JButton(tr("Find"));
+ bFind.setActionCommand("stopImporter.stoplistFind");
+ bFind.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bFind, layoutCons);
+ contentPane.add(bFind);
+
+ JButton bShow = new JButton(tr("Show"));
+ bShow.setActionCommand("stopImporter.stoplistShow");
+ bShow.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bShow, layoutCons);
+ contentPane.add(bShow);
+
+ JButton bMark = new JButton(tr("Mark"));
+ bMark.setActionCommand("stopImporter.stoplistMark");
+ bMark.addActionListener(controller);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bMark, layoutCons);
+ contentPane.add(bMark);
+
+ JButton bDetach = new JButton(tr("Detach"));
+ bDetach.setActionCommand("stopImporter.stoplistDetach");
+ bDetach.addActionListener(controller);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 2;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDetach, layoutCons);
+ contentPane.add(bDetach);
+
+ JButton bAdd = new JButton(tr("Add"));
+ bAdd.setActionCommand("stopImporter.stoplistAdd");
+ bAdd.addActionListener(controller);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bAdd, layoutCons);
+ contentPane.add(bAdd);
+
+ JButton bDelete = new JButton(tr("Delete"));
+ bDelete.setActionCommand("stopImporter.stoplistDelete");
+ bDelete.addActionListener(controller);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDelete, layoutCons);
+ contentPane.add(bDelete);
+
+ JButton bSort = new JButton(tr("Sort"));
+ bSort.setActionCommand("stopImporter.stoplistSort");
+ bSort.addActionListener(controller);
+
+ layoutCons.gridx = 3;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bSort, layoutCons);
+ contentPane.add(bSort);
+
+ // Waypoints Tab
+ contentPane = tabWaypoints;
+ gridbag = new GridBagLayout();
+ layoutCons = new GridBagConstraints();
+ contentPane.setLayout(gridbag);
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt N"), "stopImporter.focusName");
+ contentPane.getActionMap().put("stopImporter.focusName",
+ controller.getFocusWaypointNameAction());
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt S"), "stopImporter.focusShelterYes");
+ contentPane.getActionMap().put("stopImporter.focusShelterYes",
+ controller.getFocusWaypointShelterAction("yes"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt T"), "stopImporter.focusShelterNo");
+ contentPane.getActionMap().put("stopImporter.focusShelterNo",
+ controller.getFocusWaypointShelterAction("no"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt U"), "stopImporter.focusShelterImplicit");
+ contentPane.getActionMap().put("stopImporter.focusShelterImplicit",
+ controller.getFocusWaypointShelterAction("implicit"));
+ contentPane.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT)
+ .put(KeyStroke.getKeyStroke("alt D"), "stopImporter.waypointsDelete");
+ contentPane.getActionMap().put("stopImporter.waypointsDelete",
+ controller.getFocusWaypointDeleteAction());
+
+ tableSP = new JScrollPane(waypointTable);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 0;
+ layoutCons.gridwidth = 3;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 1.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(tableSP, layoutCons);
+ contentPane.add(tableSP);
+
+ bFind = new JButton(tr("Find"));
+ bFind.setActionCommand("stopImporter.waypointsFind");
+ bFind.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bFind, layoutCons);
+ contentPane.add(bFind);
+
+ bShow = new JButton(tr("Show"));
+ bShow.setActionCommand("stopImporter.waypointsShow");
+ bShow.addActionListener(controller);
+
+ layoutCons.gridx = 0;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bShow, layoutCons);
+ contentPane.add(bShow);
+
+ bMark = new JButton(tr("Mark"));
+ bMark.setActionCommand("stopImporter.waypointsMark");
+ bMark.addActionListener(controller);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bMark, layoutCons);
+ contentPane.add(bMark);
+
+ bDetach = new JButton(tr("Detach"));
+ bDetach.setActionCommand("stopImporter.waypointsDetach");
+ bDetach.addActionListener(controller);
+
+ layoutCons.gridx = 1;
+ layoutCons.gridy = 2;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDetach, layoutCons);
+ contentPane.add(bDetach);
+
+ bAdd = new JButton(tr("Enable"));
+ bAdd.setActionCommand("stopImporter.waypointsAdd");
+ bAdd.addActionListener(controller);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 1;
+ layoutCons.gridheight = 1;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bAdd, layoutCons);
+ contentPane.add(bAdd);
+
+ bDelete = new JButton(tr("Disable"));
+ bDelete.setActionCommand("stopImporter.waypointsDelete");
+ bDelete.addActionListener(controller);
+
+ layoutCons.gridx = 2;
+ layoutCons.gridy = 2;
+ layoutCons.gridwidth = 1;
+ layoutCons.weightx = 1.0;
+ layoutCons.weighty = 0.0;
+ layoutCons.fill = GridBagConstraints.BOTH;
+ gridbag.setConstraints(bDelete, layoutCons);
+ contentPane.add(bDelete);
+ }
+
+ public JTable getStoplistTable() {
+ return stoplistTable;
+ }
+
+ public void setStoplistTableModel(TrackStoplistTableModel model) {
+ stoplistTable.setModel(model);
+ JComboBox comboBox = new JComboBox<>();
+ comboBox.addItem(new TransText(null));
+ comboBox.addItem(new TransText(marktr("yes")));
+ comboBox.addItem(new TransText(marktr("no")));
+ comboBox.addItem(new TransText(marktr("implicit")));
+ stoplistTable.getColumnModel().getColumn(2).setCellEditor(new DefaultCellEditor(comboBox));
+ int width = stoplistTable.getPreferredSize().width;
+ stoplistTable.getColumnModel().getColumn(0).setPreferredWidth((int) (width * 0.4));
+ stoplistTable.getColumnModel().getColumn(1).setPreferredWidth((int) (width * 0.5));
+ stoplistTable.getColumnModel().getColumn(2).setPreferredWidth((int) (width * 0.1));
+ }
+
+ public JTable getWaypointsTable() {
+ return waypointTable;
+ }
+
+ public void setWaypointsTableModel(WaypointTableModel model) {
+ waypointTable.setModel(model);
+ JComboBox comboBox = new JComboBox<>();
+ comboBox.addItem(new TransText(null));
+ comboBox.addItem(new TransText(marktr("yes")));
+ comboBox.addItem(new TransText(marktr("no")));
+ comboBox.addItem(new TransText(marktr("implicit")));
+ waypointTable.getColumnModel().getColumn(2).setCellEditor(new DefaultCellEditor(comboBox));
+ int width = waypointTable.getPreferredSize().width;
+ waypointTable.getColumnModel().getColumn(0).setPreferredWidth((int) (width * 0.4));
+ waypointTable.getColumnModel().getColumn(1).setPreferredWidth((int) (width * 0.5));
+ waypointTable.getColumnModel().getColumn(2).setPreferredWidth((int) (width * 0.1));
+ }
+
+ private class TracksLSL implements ListSelectionListener {
+ StopImporterAction root = null;
+
+ TracksLSL(StopImporterAction sia) {
+ root = sia;
+ }
+
+ @Override
+ public void valueChanged(ListSelectionEvent e) {
+ int selectedPos = tracksList.getAnchorSelectionIndex();
+ if (tracksList.isSelectedIndex(selectedPos))
+ root.tracksSelectionChanged(selectedPos);
+ else
+ root.tracksSelectionChanged(-1);
+ }
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/GTFSStopTableModel.java (revision 34718)
@@ -0,0 +1,215 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.models;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Iterator;
+import java.util.Vector;
+
+import javax.swing.table.DefaultTableModel;
+
+import org.openstreetmap.josm.data.DataSource;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.gui.MainApplication;
+import org.openstreetmap.josm.plugins.public_transport.actions.GTFSImporterAction;
+
+/**
+ * GTFS stop table model
+ */
+public class GTFSStopTableModel extends DefaultTableModel {
+
+ public Vector nodes = new Vector<>();
+
+ public Vector coors = new Vector<>();
+
+ private int idCol = -1;
+
+ private int nameCol = -1;
+
+ private int latCol = -1;
+
+ private int lonCol = -1;
+
+ private char separator = ',';
+
+ public GTFSStopTableModel(GTFSImporterAction controller, String columnConfig) {
+ int pos = columnConfig.indexOf(separator);
+ if (pos == -1) {
+ separator = ';';
+ pos = columnConfig.indexOf(separator);
+ }
+ if (pos == -1) {
+ separator = '\t';
+ pos = columnConfig.indexOf(separator);
+ }
+ int oldPos = 0;
+ int i = 0;
+ while (pos > -1) {
+ String title = stripQuot(columnConfig.substring(oldPos, pos));
+ if ("stop_id".equals(title))
+ idCol = i;
+ else if ("stop_name".equals(title))
+ nameCol = i;
+ else if ("stop_lat".equals(title))
+ latCol = i;
+ else if ("stop_lon".equals(title))
+ lonCol = i;
+ ++i;
+ oldPos = pos + 1;
+ pos = columnConfig.indexOf(separator, oldPos);
+ }
+ String title = columnConfig.substring(oldPos);
+ if ("stop_id".equals(title))
+ idCol = i;
+ else if ("stop_name".equals(title))
+ nameCol = i;
+ else if ("stop_lat".equals(title))
+ latCol = i;
+ else if ("stop_lon".equals(title))
+ lonCol = i;
+
+ addColumn(tr("Id"));
+ addColumn(tr("Name"));
+ addColumn(tr("State"));
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ return false;
+ }
+
+ @Override
+ public void addRow(Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void insertRow(int insPos, Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addRow(String s) {
+ insertRow(-1, s, new Vector());
+ }
+
+ public void addRow(String s, Vector existingStops) {
+ insertRow(-1, s, existingStops);
+ }
+
+ /**
+ * tokenizes a line as follows: any comma outside a pair of double quotation marks is taken as field separator.
+ * In particular, neither \" nor \, have a special meaning.
+ * @param s the string to tokenize
+ * @param startPos the position of the last field separator plus 1 or the value 0
+ * @return the position of the next field separator, if any. Otherwise it returns -1
+ */
+ private int tokenize(String s, int startPos) {
+ int pos = startPos;
+ boolean insideDoubleQuoted = false;
+ while (pos < s.length()) {
+ if ('"' == s.charAt(pos))
+ insideDoubleQuoted = !insideDoubleQuoted;
+ else if (separator == s.charAt(pos) && !insideDoubleQuoted)
+ break;
+ ++pos;
+ }
+ if (pos < s.length())
+ return pos;
+ else
+ return -1;
+ }
+
+ private String stripQuot(String s) {
+ int pos = s.indexOf('"');
+ while (pos > -1) {
+ s = s.substring(0, pos) + s.substring(pos + 1);
+ pos = s.indexOf('"');
+ }
+ return s;
+ }
+
+ public void insertRow(int insPos, String s, Vector existingStops) {
+ String[] buf = {"", "", tr("pending")};
+ int pos = tokenize(s, 0);
+ int oldPos = 0;
+ int i = 0;
+ double lat = 0;
+ double lon = 0;
+ while (pos > -1) {
+ if (i == idCol)
+ buf[0] = stripQuot(s.substring(oldPos, pos));
+ else if (i == nameCol)
+ buf[1] = stripQuot(s.substring(oldPos, pos));
+ else if (i == latCol)
+ lat = Double.parseDouble(stripQuot(s.substring(oldPos, pos)));
+ else if (i == lonCol)
+ lon = Double.parseDouble(stripQuot(s.substring(oldPos, pos)));
+ ++i;
+ oldPos = pos + 1;
+ pos = tokenize(s, oldPos);
+ }
+ if (i == idCol)
+ buf[0] = stripQuot(s.substring(oldPos));
+ else if (i == nameCol)
+ buf[1] = stripQuot(s.substring(oldPos));
+ else if (i == latCol)
+ lat = Double.parseDouble(stripQuot(s.substring(oldPos)));
+ else if (i == lonCol)
+ lon = Double.parseDouble(stripQuot(s.substring(oldPos)));
+
+ LatLon coor = new LatLon(lat, lon);
+
+ DataSet ds = MainApplication.getLayerManager().getEditDataSet();
+ if (ds != null) {
+ boolean inside = false;
+ Iterator iter = ds.getDataSources().iterator();
+ while (iter.hasNext()) {
+ if (iter.next().bounds.contains(coor)) {
+ inside = true;
+ break;
+ }
+ }
+ if (!inside)
+ buf[2] = tr("outside");
+ }
+
+ boolean nearBusStop = false;
+ Iterator iter = existingStops.iterator();
+ while (iter.hasNext()) {
+ Node node = iter.next();
+ if (coor.greatCircleDistance(node.getCoor()) < 1000) {
+ nearBusStop = true;
+ break;
+ }
+ }
+
+ if (insPos == -1) {
+ if (nearBusStop || !tr("pending").equals(buf[2]))
+ nodes.addElement(null);
+ else {
+ Node node = GTFSImporterAction.createNode(coor, buf[0], buf[1]);
+ nodes.addElement(node);
+ buf[2] = tr("added");
+ }
+ coors.addElement(coor);
+ super.addRow(buf);
+ } else {
+ if (nearBusStop || !tr("pending").equals(buf[2]))
+ nodes.insertElementAt(null, insPos);
+ else {
+ Node node = GTFSImporterAction.createNode(coor, buf[0], buf[1]);
+ nodes.insertElementAt(node, insPos);
+ buf[2] = tr("added");
+ }
+ coors.insertElementAt(coor, insPos);
+ super.insertRow(insPos, buf);
+ }
+ }
+
+ public void clear() {
+ nodes.clear();
+ super.setRowCount(0);
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/ItineraryTableModel.java (revision 34718)
@@ -0,0 +1,150 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.models;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Vector;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.DefaultTableModel;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.plugins.public_transport.actions.RoutePatternAction;
+
+public class ItineraryTableModel extends DefaultTableModel implements TableModelListener {
+ public Vector ways = new Vector<>();
+
+ public boolean inEvent = false;
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ if (column != 1)
+ return false;
+ if (ways.elementAt(row) == null)
+ return false;
+ return true;
+ }
+
+ @Override
+ public void addRow(Object[] obj) {
+ ways.addElement(null);
+ super.addRow(obj);
+ }
+
+ @Override
+ public void insertRow(int insPos, Object[] obj) {
+ if (insPos == -1) {
+ ways.addElement(null);
+ super.addRow(obj);
+ } else {
+ ways.insertElementAt(null, insPos);
+ super.insertRow(insPos, obj);
+ }
+ }
+
+ public void addRow(Way way, String role) {
+ insertRow(-1, way, role);
+ }
+
+ public void insertRow(int insPos, Way way, String role) {
+ String[] buf = {"", ""};
+ String curName = way.get("name");
+ if (way.isIncomplete())
+ buf[0] = tr("[incomplete]");
+ else if (way.getNodesCount() < 1)
+ buf[0] = tr("[empty way]");
+ else if (curName != null)
+ buf[0] = curName;
+ else
+ buf[0] = tr("[ID] {0}", Long.valueOf(way.getId()));
+ buf[1] = role;
+ if (insPos == -1) {
+ ways.addElement(way);
+ super.addRow(buf);
+ } else {
+ ways.insertElementAt(way, insPos);
+ super.insertRow(insPos, buf);
+ }
+ }
+
+ public void clear() {
+ ways.clear();
+ super.setRowCount(0);
+ }
+
+ public void cleanupGaps() {
+ inEvent = true;
+ Node lastNode = null;
+
+ for (int i = 0; i < getRowCount(); ++i) {
+ if (ways.elementAt(i) == null) {
+ ++i;
+ if (i >= getRowCount())
+ break;
+ }
+ while ((ways.elementAt(i) == null) && ((i == 0) || (ways.elementAt(i - 1) == null))) {
+ ways.removeElementAt(i);
+ removeRow(i);
+ if (i >= getRowCount())
+ break;
+ }
+ if (i >= getRowCount())
+ break;
+
+ boolean gapRequired = gapNecessary(ways.elementAt(i), (String) getValueAt(i, 1),
+ lastNode);
+ if (i > 0 && !gapRequired && ways.elementAt(i - 1) == null) {
+ ways.removeElementAt(i - 1);
+ removeRow(i - 1);
+ --i;
+ } else if (i > 0 && gapRequired && ways.elementAt(i - 1) != null) {
+ String[] buf = {"", ""};
+ buf[0] = tr("[gap]");
+ insertRow(i, buf);
+ ++i;
+ }
+ lastNode = getLastNode(ways.elementAt(i), (String) getValueAt(i, 1));
+ }
+ while (getRowCount() > 0 && ways.elementAt(getRowCount() - 1) == null) {
+ ways.removeElementAt(getRowCount() - 1);
+ removeRow(getRowCount() - 1);
+ }
+ inEvent = false;
+ }
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if (e.getType() == TableModelEvent.UPDATE) {
+ if (inEvent)
+ return;
+ cleanupGaps();
+ RoutePatternAction.rebuildWays();
+ }
+ }
+
+ private Node getLastNode(Way way, String role) {
+ if (way == null || way.isIncomplete() || way.getNodesCount() < 1)
+ return null;
+ else {
+ if ("backward".equals(role))
+ return way.getNode(0);
+ else
+ return way.getNode(way.getNodesCount() - 1);
+ }
+ }
+
+ private boolean gapNecessary(Way way, String role, Node lastNode) {
+ if (way != null && !way.isIncomplete() && way.getNodesCount() >= 1) {
+ Node firstNode = null;
+ if ("backward".equals(role))
+ firstNode = way.getNode(way.getNodesCount() - 1);
+ else
+ firstNode = way.getNode(0);
+ if (lastNode != null && !lastNode.equals(firstNode))
+ return true;
+ }
+ return false;
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/TrackStoplistTableModel.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/TrackStoplistTableModel.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/TrackStoplistTableModel.java (revision 34718)
@@ -0,0 +1,119 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.models;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Vector;
+
+import javax.swing.table.DefaultTableModel;
+
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.refs.TrackReference;
+
+public class TrackStoplistTableModel extends DefaultTableModel {
+ private Vector nodes = null;
+
+ private Vector times = null;
+
+ private static Vector columns = null;
+
+ public TrackStoplistTableModel(TrackReference tr) {
+ if (columns == null) {
+ columns = new Vector<>();
+ columns.add(tr("Time"));
+ columns.add(tr("Name"));
+ columns.add(tr("Shelter"));
+ }
+ nodes = new Vector<>();
+ times = new Vector<>();
+
+ setColumnIdentifiers(columns);
+ addTableModelListener(tr);
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ return true;
+ }
+
+ @Override
+ public void addRow(Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void insertRow(int insPos, Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addRow(String time) {
+ insertRow(-1, time);
+ }
+
+ public void insertRow(int insPos, String time) {
+ insertRow(insPos, null, time, "", new TransText(null));
+ }
+
+ @Override
+ public void removeRow(int pos) {
+ super.removeRow(pos);
+ nodes.removeElementAt(pos);
+ times.removeElementAt(pos);
+ }
+
+ public Node nodeAt(int i) {
+ return nodes.elementAt(i);
+ }
+
+ public void setNodeAt(int i, Node node) {
+ nodes.set(i, node);
+ }
+
+ public final Vector getNodes() {
+ return nodes;
+ }
+
+ public void setNodes(Vector nodes) {
+ this.nodes = nodes;
+ }
+
+ public String timeAt(int i) {
+ return times.elementAt(i);
+ }
+
+ public void setTimeAt(int i, String time) {
+ times.set(i, time);
+ }
+
+ public final Vector getTimes() {
+ return times;
+ }
+
+ public void setTimes(Vector times) {
+ this.times = times;
+ }
+
+ public void insertRow(int insPos, Node node, String time, String name, TransText shelter) {
+ Object[] buf = {time, name, shelter};
+ if (insPos == -1) {
+ nodes.addElement(node);
+ times.addElement(time);
+ super.addRow(buf);
+ } else {
+ nodes.insertElementAt(node, insPos);
+ times.insertElementAt(time, insPos);
+ super.insertRow(insPos, buf);
+ }
+ }
+
+ public void clear() {
+ nodes.clear();
+ times.clear();
+ super.setRowCount(0);
+ }
+
+ public void setDataVector(Vector> dataVector) {
+ setDataVector(dataVector, columns);
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/WaypointTableModel.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/WaypointTableModel.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/models/WaypointTableModel.java (revision 34718)
@@ -0,0 +1,95 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.models;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Vector;
+
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+import javax.swing.table.DefaultTableModel;
+
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.public_transport.TransText;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.commands.WaypointsNameCommand;
+
+public class WaypointTableModel extends DefaultTableModel implements TableModelListener {
+ private StopImporterAction controller = null;
+
+ public boolean inEvent = false;
+
+ public Vector nodes = new Vector<>();
+
+ public Vector coors = new Vector<>();
+
+ public WaypointTableModel(StopImporterAction controller) {
+ this.controller = controller;
+ addColumn(tr("Time"));
+ addColumn(tr("Stopname"));
+ addColumn(tr("Shelter"));
+ addTableModelListener(this);
+ }
+
+ @Override
+ public boolean isCellEditable(int row, int column) {
+ if (column >= 1)
+ return true;
+ return false;
+ }
+
+ @Override
+ public void addRow(Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ @Override
+ public void insertRow(int insPos, Object[] obj) {
+ throw new UnsupportedOperationException();
+ }
+
+ public void addRow(WayPoint wp) {
+ insertRow(-1, wp);
+ }
+
+ public void insertRow(int insPos, WayPoint wp) {
+ String time = wp.getString("time");
+ if (time == null)
+ time = "";
+ String name = wp.getString("name");
+ if (name == null)
+ name = "";
+
+ Node node = controller.createNode(wp.getCoor(), name);
+
+ Object[] buf = {time, name, new TransText(null)};
+ if (insPos == -1) {
+ nodes.addElement(node);
+ coors.addElement(wp.getCoor());
+ super.addRow(buf);
+ } else {
+ nodes.insertElementAt(node, insPos);
+ coors.insertElementAt(wp.getCoor(), insPos);
+ super.insertRow(insPos, buf);
+ }
+ }
+
+ public void clear() {
+ nodes.clear();
+ super.setRowCount(0);
+ }
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if (e.getType() == TableModelEvent.UPDATE) {
+ if (inEvent)
+ return;
+ UndoRedoHandler.getInstance().add(new WaypointsNameCommand(this, e.getFirstRow(),
+ (String) getValueAt(e.getFirstRow(), 1),
+ (TransText) getValueAt(e.getFirstRow(), 2)));
+ }
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/RouteReference.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/RouteReference.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/RouteReference.java (revision 34718)
@@ -0,0 +1,77 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.refs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import org.openstreetmap.josm.data.osm.Relation;
+
+public class RouteReference implements Comparable {
+ public final Relation route;
+
+ public RouteReference(Relation route) {
+ this.route = route;
+ }
+
+ @Override
+ public int compareTo(RouteReference rr) {
+ if (route.get("route") != null) {
+ if (rr.route.get("route") == null)
+ return -1;
+ int result = route.get("route").compareTo(rr.route.get("route"));
+ if (result != 0)
+ return result;
+ } else if (rr.route.get("route") != null)
+ return 1;
+ if (route.get("ref") != null) {
+ if (rr.route.get("ref") == null)
+ return -1;
+ int result = route.get("ref").compareTo(rr.route.get("ref"));
+ if (result != 0)
+ return result;
+ } else if (rr.route.get("ref") != null)
+ return 1;
+ if (route.get("to") != null) {
+ if (rr.route.get("to") == null)
+ return -1;
+ int result = route.get("to").compareTo(rr.route.get("to"));
+ if (result != 0)
+ return result;
+ } else if (rr.route.get("to") != null)
+ return 1;
+ if (route.get("direction") != null) {
+ if (rr.route.get("direction") == null)
+ return -1;
+ int result = route.get("direction").compareTo(rr.route.get("direction"));
+ if (result != 0)
+ return result;
+ } else if (rr.route.get("direction") != null)
+ return 1;
+ if (route.getId() < rr.route.getId())
+ return -1;
+ else if (route.getId() > rr.route.getId())
+ return 1;
+ return 0;
+ }
+
+ @Override
+ public String toString() {
+ String buf = route.get("route");
+ if ((route.get("ref") != null) && (route.get("ref") != "")) {
+ buf += " " + route.get("ref");
+ }
+ if ((route.get("loc_ref") != null) && (route.get("loc_ref") != "")) {
+ buf += " [" + route.get("loc_ref") + "]";
+ }
+
+ if ((route.get("to") != null) && (route.get("to") != "")) {
+ buf += ": " + route.get("to");
+ } else if ((route.get("direction") != null) && (route.get("direction") != "")) {
+ buf += " " + route.get("ref") + ": " + route.get("direction");
+ } else {
+ buf += " " + route.get("ref");
+ }
+ buf += tr(" [ID] {0}", Long.toString(route.getId()));
+
+ return buf;
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/StopReference.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/StopReference.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/StopReference.java (revision 34718)
@@ -0,0 +1,41 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.refs;
+
+import org.openstreetmap.josm.data.osm.Node;
+
+public class StopReference implements Comparable {
+ public int index = 0;
+
+ public double pos = 0;
+
+ public double distance = 0;
+
+ public String name = "";
+
+ public String role = "";
+
+ public Node node;
+
+ public StopReference(int inIndex, double inPos, double inDistance, String inName,
+ String inRole, Node inNode) {
+ index = inIndex;
+ pos = inPos;
+ distance = inDistance;
+ name = inName;
+ role = inRole;
+ node = inNode;
+ }
+
+ @Override
+ public int compareTo(StopReference sr) {
+ if (this.index < sr.index)
+ return -1;
+ if (this.index > sr.index)
+ return 1;
+ if (this.pos < sr.pos)
+ return -1;
+ if (this.pos > sr.pos)
+ return 1;
+ return 0;
+ }
+}
Index: /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java
===================================================================
--- /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java (revision 34718)
+++ /applications/editors/josm/plugins/public_transport/src/org/openstreetmap/josm/plugins/public_transport/refs/TrackReference.java (revision 34718)
@@ -0,0 +1,188 @@
+// License: GPL. For details, see LICENSE file.
+package org.openstreetmap.josm.plugins.public_transport.refs;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
+
+import java.util.Iterator;
+
+import javax.swing.JOptionPane;
+import javax.swing.event.TableModelEvent;
+import javax.swing.event.TableModelListener;
+
+import org.openstreetmap.josm.command.ChangeCommand;
+import org.openstreetmap.josm.command.Command;
+import org.openstreetmap.josm.data.UndoRedoHandler;
+import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.gpx.GpxTrack;
+import org.openstreetmap.josm.data.gpx.GpxTrackSegment;
+import org.openstreetmap.josm.data.gpx.WayPoint;
+import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.plugins.public_transport.actions.StopImporterAction;
+import org.openstreetmap.josm.plugins.public_transport.commands.TrackStoplistNameCommand;
+import org.openstreetmap.josm.plugins.public_transport.dialogs.StopImporterDialog;
+import org.openstreetmap.josm.plugins.public_transport.models.TrackStoplistTableModel;
+
+public class TrackReference implements Comparable, TableModelListener {
+ public GpxTrack track;
+
+ public TrackStoplistTableModel stoplistTM;
+
+ public String stopwatchStart;
+
+ public String gpsStartTime;
+
+ public String gpsSyncTime;
+
+ public double timeWindow;
+
+ public double threshold;
+
+ private StopImporterAction controller = null;
+
+ public boolean inEvent = false;
+
+ public TrackReference(GpxTrack track, StopImporterAction controller) {
+ this.track = track;
+ this.stoplistTM = new TrackStoplistTableModel(this);
+ this.stopwatchStart = "00:00:00";
+ this.gpsStartTime = null;
+ this.gpsSyncTime = null;
+ this.controller = controller;
+ if (track != null) {
+ Iterator siter = track.getSegments().iterator();
+ while (siter.hasNext() && this.gpsSyncTime == null) {
+ Iterator witer = siter.next().getWayPoints().iterator();
+ if (witer.hasNext()) {
+ this.gpsStartTime = witer.next().getString("time");
+ if (this.gpsStartTime != null)
+ this.gpsSyncTime = this.gpsStartTime.substring(11, 19);
+ }
+ }
+ if (this.gpsSyncTime == null) {
+ JOptionPane.showMessageDialog(null,
+ tr("The GPX file doesn''t contain valid trackpoints. "
+ + "Please use a GPX file that has trackpoints."),
+ tr("GPX File Trouble"), JOptionPane.ERROR_MESSAGE);
+
+ this.gpsStartTime = "1970-01-01T00:00:00Z";
+ this.gpsSyncTime = this.stopwatchStart;
+ }
+ } else
+ this.gpsSyncTime = this.stopwatchStart;
+ this.timeWindow = 20;
+ this.threshold = 20;
+ }
+
+ public GpxTrack getGpxTrack() {
+ return track;
+ }
+
+ @Override
+ public int compareTo(TrackReference tr) {
+ String name = (String) track.getAttributes().get("name");
+ String tr_name = (String) tr.track.getAttributes().get("name");
+ if (name != null) {
+ if (tr_name == null)
+ return -1;
+ return name.compareTo(tr_name);
+ }
+ return 1;
+ }
+
+ @Override
+ public String toString() {
+ String buf = (String) track.getAttributes().get("name");
+ if (buf == null)
+ return tr("unnamed");
+ return buf;
+ }
+
+ @Override
+ public void tableChanged(TableModelEvent e) {
+ if ((e.getType() == TableModelEvent.UPDATE) && (e.getFirstRow() >= 0)) {
+ if (inEvent)
+ return;
+
+ double time = StopImporterDialog
+ .parseTime((String) stoplistTM.getValueAt(e.getFirstRow(), 0));
+ if (time < 0) {
+ stoplistTM.setValueAt(stoplistTM.timeAt(e.getFirstRow()), e.getFirstRow(), 0);
+ JOptionPane.showMessageDialog(null, tr("Can''t parse a time from this string."),
+ tr("Invalid value"), JOptionPane.ERROR_MESSAGE);
+ return;
+ }
+
+ UndoRedoHandler.getInstance().add(new TrackStoplistNameCommand(this, e.getFirstRow()));
+ stoplistTM.setTimeAt(e.getFirstRow(),
+ (String) stoplistTM.getValueAt(e.getFirstRow(), 0));
+ }
+ }
+
+ public LatLon computeCoor(double time) {
+ double gpsSyncTime = StopImporterDialog.parseTime(this.gpsSyncTime);
+ double dGpsStartTime = StopImporterDialog.parseTime(gpsStartTime);
+ if (gpsSyncTime < dGpsStartTime - 12 * 60 * 60)
+ gpsSyncTime += 24 * 60 * 60;
+ double timeDelta = gpsSyncTime - StopImporterDialog.parseTime(stopwatchStart);
+ time += timeDelta;
+
+ WayPoint wayPoint = null;
+ WayPoint lastWayPoint = null;
+ double wayPointTime = 0;
+ double lastWayPointTime = 0;
+ Iterator siter = track.getSegments().iterator();
+ while (siter.hasNext()) {
+ Iterator witer = siter.next().getWayPoints().iterator();
+ while (witer.hasNext()) {
+ wayPoint = witer.next();
+ String startTime = wayPoint.getString("time");
+ wayPointTime = StopImporterDialog.parseTime(startTime.substring(11, 19));
+ if (startTime.substring(11, 19).compareTo(gpsStartTime.substring(11, 19)) == -1)
+ wayPointTime += 24 * 60 * 60;
+ if (wayPointTime >= time)
+ break;
+ lastWayPoint = wayPoint;
+ lastWayPointTime = wayPointTime;
+ }
+ if (wayPointTime >= time)
+ break;
+ }
+
+ double lat = 0;
+ if ((wayPointTime == lastWayPointTime) || (lastWayPoint == null))
+ lat = wayPoint.getCoor().lat();
+ else
+ lat = wayPoint.getCoor().lat() * (time - lastWayPointTime)
+ / (wayPointTime - lastWayPointTime)
+ + lastWayPoint.getCoor().lat() * (wayPointTime - time)
+ / (wayPointTime - lastWayPointTime);
+ double lon = 0;
+ if ((wayPointTime == lastWayPointTime) || (lastWayPoint == null))
+ lon = wayPoint.getCoor().lon();
+ else
+ lon = wayPoint.getCoor().lon() * (time - lastWayPointTime)
+ / (wayPointTime - lastWayPointTime)
+ + lastWayPoint.getCoor().lon() * (wayPointTime - time)
+ / (wayPointTime - lastWayPointTime);
+
+ return new LatLon(lat, lon);
+ }
+
+ public void relocateNodes() {
+ for (int i = 0; i < stoplistTM.getNodes().size(); ++i) {
+ Node node = stoplistTM.nodeAt(i);
+ if (node == null)
+ continue;
+
+ double time = StopImporterDialog.parseTime((String) stoplistTM.getValueAt(i, 0));
+ LatLon latLon = computeCoor(time);
+
+ Node newNode = new Node(node);
+ newNode.setCoor(latLon);
+ Command cmd = new ChangeCommand(node, newNode);
+ if (cmd != null) {
+ UndoRedoHandler.getInstance().add(cmd);
+ }
+ }
+ }
+}