Index: applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelation.java =================================================================== --- applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelation.java (revision 25678) +++ applications/editors/josm/plugins/relcontext/src/relcontext/ChosenRelation.java (revision 25679) @@ -47,5 +47,5 @@ private final static String[] MULTIPOLYGON_TYPES = new String[] { - "multipolygon", "boundary", "natural_reserve" + "multipolygon", "boundary" }; Index: applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java =================================================================== --- applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (revision 25678) +++ applications/editors/josm/plugins/relcontext/src/relcontext/RelContextDialog.java (revision 25679) @@ -1,22 +1,23 @@ package relcontext; -import java.awt.event.ActionEvent; -import java.awt.event.ComponentEvent; -import java.awt.event.FocusEvent; -import java.beans.PropertyChangeEvent; -import static org.openstreetmap.josm.tools.I18n.tr; +import org.openstreetmap.josm.gui.DefaultNameFormatter; +import org.openstreetmap.josm.data.osm.NameFormatter; +import java.awt.Component; +import javax.swing.event.ListSelectionEvent; +import javax.swing.table.DefaultTableCellRenderer; +import javax.swing.table.TableColumnModel; +import javax.swing.table.DefaultTableModel; +import java.awt.event.*; +import java.util.*; +import javax.swing.*; +import relcontext.actions.*; import java.awt.BorderLayout; import java.awt.Dialog.ModalityType; -import java.awt.Dimension; import java.awt.FlowLayout; import java.awt.GridBagLayout; -import java.awt.event.ActionListener; -import java.awt.event.ComponentAdapter; -import java.awt.event.FocusAdapter; -import java.awt.event.KeyEvent; -import java.awt.event.MouseEvent; -import java.awt.event.MouseAdapter; +import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; +import javax.swing.event.ListSelectionListener; import org.openstreetmap.josm.Main; @@ -26,4 +27,6 @@ import org.openstreetmap.josm.data.osm.event.SelectionEventManager; import org.openstreetmap.josm.data.osm.OsmPrimitive; +import org.openstreetmap.josm.data.osm.RelationMember; +import org.openstreetmap.josm.data.osm.event.DatasetEventManager; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.gui.MapView; @@ -32,15 +35,9 @@ import org.openstreetmap.josm.gui.dialogs.ToggleDialog; import org.openstreetmap.josm.tools.Shortcut; - -import java.util.*; -import javax.swing.*; +import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.command.ChangeCommand; -import org.openstreetmap.josm.data.osm.RelationMember; -import org.openstreetmap.josm.data.osm.event.DatasetEventManager; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletingComboBox; import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionListItem; -import org.openstreetmap.josm.gui.tagging.ac.AutoCompletionManager; -import org.openstreetmap.josm.tools.GBC; -import relcontext.actions.*; +import static org.openstreetmap.josm.tools.I18n.tr; /** @@ -50,6 +47,6 @@ */ public class RelContextDialog extends ToggleDialog implements EditLayerChangeListener, ChosenRelationListener, SelectionChangedListener { - private JList relationsList; - private final DefaultListModel relationsData; + + private final DefaultTableModel relationsData; private ChosenRelation chosenRelation; private JPanel chosenRelationPanel; @@ -71,24 +68,9 @@ MapView.addEditLayerChangeListener(chosenRelation); - relationsData = new DefaultListModel(); - relationsList = new JList(relationsData); - relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); - relationsList.setCellRenderer(new OsmPrimitivRenderer() { - @Override - protected String getComponentToolTipText( OsmPrimitive value ) { - return null; - } - }); - relationsList.addMouseListener(new MouseAdapter() { - @Override - public void mouseClicked( MouseEvent e ) { - if( Main.main.getEditLayer() == null ) { - return; - } - chosenRelation.set((Relation)relationsList.getSelectedValue()); - relationsList.clearSelection(); - } - }); - rcPanel.add(new JScrollPane(relationsList), BorderLayout.CENTER); + relationsData = new RelationTableModel(); + relationsData.setColumnIdentifiers(new String[] {tr("Member Of"), tr("Role")}); + final JTable relationsTable = new JTable(relationsData); + configureRelationsTable(relationsTable); + rcPanel.add(new JScrollPane(relationsTable, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), BorderLayout.CENTER); chosenRelationPanel = new JPanel(new BorderLayout()); @@ -173,4 +155,47 @@ } + private void configureRelationList( final JList relationsList ) { + relationsList.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + relationsList.setCellRenderer(new OsmPrimitivRenderer() { + @Override + protected String getComponentToolTipText( OsmPrimitive value ) { + return null; + } + }); + relationsList.addMouseListener(new MouseAdapter() { + @Override + public void mouseClicked( MouseEvent e ) { + if( Main.main.getEditLayer() == null ) { + return; + } + chosenRelation.set((Relation)relationsList.getSelectedValue()); + relationsList.clearSelection(); + } + }); + } + + private void configureRelationsTable( final JTable relationsTable ) { + relationsTable.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); + relationsTable.setTableHeader(null); + TableColumnModel columns = relationsTable.getColumnModel(); + columns.getColumn(0).setCellRenderer(new OsmPrimitivRenderer() { + @Override + protected String getComponentToolTipText( OsmPrimitive value ) { + return null; + } + }); + columns.getColumn(1).setPreferredWidth(40); + columns.getColumn(0).setPreferredWidth(220); + relationsTable.getSelectionModel().addListSelectionListener(new ListSelectionListener() { + public void valueChanged( ListSelectionEvent e ) { + int selectedRow = relationsTable.getSelectedRow(); + if( selectedRow >= 0 ) { + chosenRelation.set((Relation)relationsData.getValueAt(selectedRow, 0)); + relationsTable.clearSelection(); + } + } + }); + } + @Override public void hideNotify() { @@ -226,17 +251,38 @@ updateRoleIndicator(); // repopulate relations table - relationsData.clear(); + relationsData.setRowCount(0); if( newSelection == null ) return; - Set rels = new HashSet(); + + final NameFormatter formatter = DefaultNameFormatter.getInstance(); + Set relations = new TreeSet(new Comparator() { + public int compare( Relation r1, Relation r2 ) { + return r1.getDisplayName(formatter).compareTo(r2.getDisplayName(formatter)); + } + }); for( OsmPrimitive element : newSelection ) { for( OsmPrimitive ref : element.getReferrers() ) { if( ref instanceof Relation && !ref.isIncomplete() && !ref.isDeleted() ) { - rels.add((Relation) ref); - } - } - } - for( Relation rel : rels ) - relationsData.addElement(rel); + relations.add((Relation) ref); + } + } + } + + for( Relation rel : relations ) { + String role = null; + for( RelationMember m : rel.getMembers() ) { + for( OsmPrimitive element : newSelection ) { + if( m.getMember().equals(element) ) { + if( role == null ) + role = m.getRole(); + else if( !role.equals(m.getRole()) ) { + role = tr(""); + break; + } + } + } + } + relationsData.addRow(new Object[] {rel, role == null ? "" : role}); + } } @@ -257,4 +303,11 @@ possibleRoles.put("boundary", new String[] {"admin_centre", "label", "subarea"}); possibleRoles.put("route", new String[] {"forward", "backward", "stop", "platform"}); + possibleRoles.put("restriction", new String[] {"from", "to", "via", "location_hint"}); + possibleRoles.put("enforcement", new String[] {"device", "from", "to", "force"}); + possibleRoles.put("destination_sign", new String[] {"to", "from", "intersection", "sign"}); + possibleRoles.put("site", new String[] {"perimeter", "entrance", "label"}); + possibleRoles.put("bridge", new String[] {"across", "under", "outline", "edge"}); + possibleRoles.put("tunnel", new String[] {"through", "outline", "edge"}); + possibleRoles.put("surveillance", new String[] {"camera", "extent", "visible", "hidden"}); } @@ -262,5 +315,5 @@ String currentRole = roleBox.getSelectedItem() == null ? null : ((AutoCompletionListItem)roleBox.getSelectedItem()).getValue(); List items = new ArrayList(); - items.add(""); + items.add(" "); if( chosenRelation != null && chosenRelation.get() != null ) { if( chosenRelation.isMultipolygon() ) { @@ -271,20 +324,17 @@ String[] values = possibleRoles.get(chosenRelation.get().get("type")); if( values != null ) - for( String value : values ) - items.add(value); + items.addAll(Arrays.asList(values)); } for( RelationMember m : chosenRelation.get().getMembers() ) if( !items.contains(m.getRole()) ) items.add(m.getRole()); + } + if( currentRole != null && currentRole.length() > 1 ) { lastSelectedRole = currentRole; - } else if( currentRole != null && currentRole.length() > 0 ) { - lastSelectedRole = currentRole; } roleBox.setPossibleItems(items); - // todo: store last non-empty role and try to select it if present, but do not store if empty role was chosen -// if( lastSelectedRole != null && items.contains(lastSelectedRole) ) -// roleBox.setSelectedItem(lastSelectedRole); -// else if( lastSelectedRole == null && items.contains("outer") ) -// roleBox.setSelectedItem("outer"); + if( lastSelectedRole != null && items.contains(lastSelectedRole) ) + roleBox.setSelectedItem(lastSelectedRole); + // todo: do we really want empty role as default one? Maybe, store last selected role in preferences } @@ -351,5 +401,5 @@ private void checkPopup( MouseEvent e ) { if( e.isPopupTrigger() && chosenRelation.get() != null ) { - popupMenu.show(e.getComponent(), e.getX(), e.getY()); + popupMenu.show(e.getComponent(), e.getX(), e.getY() - 5); } } @@ -360,4 +410,5 @@ add(new SelectMembersAction(chosenRelation)); add(new DeleteChosenRelationAction(chosenRelation)); + add(new DownloadParentsAction(chosenRelation)); } } @@ -421,3 +472,15 @@ } } + + private static class RelationTableModel extends DefaultTableModel { + @Override + public boolean isCellEditable(int row, int column) { + return false; + } + + @Override + public Class getColumnClass(int columnIndex) { + return columnIndex == 0 ? Relation.class : String.class; + } + } } Index: applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java =================================================================== --- applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java (revision 25678) +++ applications/editors/josm/plugins/relcontext/src/relcontext/actions/CreateRelationAction.java (revision 25679) @@ -76,6 +76,9 @@ } + // Thanks to TagInfo for the list private static final List RELATION_TYPES = Arrays.asList(new String[] { - "multipolygon", "boundary", "route" + "multipolygon", "boundary", "route", "site", "restriction", "associatedStreet", "public_transport", + "street", "collection", "address", "enforcement", "destination_sign", "route_master", "junction", "site", + "waterway", "bridge", "tunnel", "surveillance" }); Index: applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java =================================================================== --- applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java (revision 25679) +++ applications/editors/josm/plugins/relcontext/src/relcontext/actions/DownloadParentsAction.java (revision 25679) @@ -0,0 +1,64 @@ +package relcontext.actions; + +import static org.openstreetmap.josm.tools.I18n.tr; +import java.awt.event.ActionEvent; +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; +import javax.swing.AbstractAction; +import org.openstreetmap.josm.Main; +import org.openstreetmap.josm.actions.downloadtasks.DownloadReferrersTask; +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.gui.dialogs.relation.DownloadRelationMemberTask; +import org.openstreetmap.josm.gui.dialogs.relation.DownloadRelationTask; +import org.openstreetmap.josm.tools.ImageProvider; +import relcontext.ChosenRelation; +import relcontext.ChosenRelationListener; + +/** + * Downloads parent relations for this relation and all parent objects for its members. + * + * @author Zverik + */ +public class DownloadParentsAction extends AbstractAction implements ChosenRelationListener { + private ChosenRelation rel; + + public DownloadParentsAction( ChosenRelation rel ) { + super(tr("Download all referrers")); + putValue(SMALL_ICON, ImageProvider.get("downloadreferrers")); + this.rel = rel; + rel.addChosenRelationListener(this); + setEnabled(false); + } + + public void actionPerformed( ActionEvent e ) { + Relation relation = rel.get(); + if( relation == null ) return; + List objects = new ArrayList(); + objects.add(relation); + objects.addAll(relation.getMemberPrimitives()); + Main.worker.submit(new DownloadReferrersTask(Main.map.mapView.getEditLayer(), objects)); + } + + public void chosenRelationChanged( Relation oldRelation, Relation newRelation ) { + setEnabled(newRelation != null && Main.map.mapView.getEditLayer() != null); + } + + protected void downloadMembers( Relation rel ) { + if( !rel.isNew() ) { + Main.worker.submit(new DownloadRelationTask(Collections.singletonList(rel), Main.map.mapView.getEditLayer())); + } + } + + protected void downloadIncomplete( Relation rel ) { + if( rel.isNew() ) return; + Set ret = new HashSet(); + ret.addAll(rel.getIncompleteMembers()); + if( ret.isEmpty() ) return; + Main.worker.submit(new DownloadRelationMemberTask(Collections.singletonList(rel), ret, Main.map.mapView.getEditLayer())); + } +}