Index: /applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml =================================================================== --- /applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml (revision 21994) +++ /applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml (revision 21995) @@ -3,5 +3,21 @@ Preset file for road signs plugin. -Plugin is in early state of development (05-2010) and it is likely, the preset format will be changing. +The plugin is in early state of development (05-2010) and the format is likely to change. + +How to customize +================ + +Add the following to your JOSM preference file +(or enter it in the advanced preferences tab in JOSM): + +plugin.roadsign.sources=/path/to/myroadsignpreset.xml +plugin.roadsign.icon.sources=/path/to/image/folder + +(The second one is only needed if you like to display your own icons.) + + +Preset format +============= + Some values can contain parameters like $foo, that will be replaced by the value of the parameter named foo. @@ -9,27 +25,35 @@ ref Short official designation of the sign that can be used for the traffic_sign tag. (accepts parameters) id Unique identifier. (If missing, equals ref. Either id or ref must be present.) - icon Icon path. (If missing, id or ref is used as icon path. In this case ':' and '.' characters are converted to underscore '_'.) + icon Icon image name. (If missing, id or ref is used as image name. In this case ':' and '.' characters are converted to underscore '_'.) name Name of the sign. (required) - long_name Official name of the sign. (optional) + long_name Long (e.g. official) name of the sign. help Some notes to guide the user. wiki Page in the osm wiki - deprecated Set to "yes" if authorities have decided to no longer install signs of this kind. + deprecated Set to "yes" if authorities have decided to no longer install signs of this kind. (But old signs may still be there and need to be recorded.) - + tag: + Some tags can be named (ident=*) and modified by other subsequent tags. If this finally results in an + empty value (""), then the tag is skipped altogether. Note that the default value of a named tag is + only used if there are no appending tags. E.g. access=no becomes access=delivery and not access=no;delivery. + static tags: key The key text. (accepts parameters) value The value text. (accepts parameters) - - identified tags: + + named tags: key The key text. value The default value text. If the final evaluation of the value results in an empty string, the tag is dropped. ident Name a tag so it can later be changed by other tags. - + modifying tags: - tag_ref Name of the tag to be changed. - append_value Append a string to the value of the tag. The default value of the identified tag is dropped (unless there is no - modifying tag appending a value). - + appending: + tag_ref Name of the tag to be changed. + append_value Append a string to the value of the tag. The default value of the identified tag is dropped (unless there is no + modifying tag appending a value). + condition: + tag_ref Name of the tag to be changed. + condition The condition to add. (K=V becomes K:cond=V.) + parameter: ident identifier to get the value of this parameter (required) @@ -39,5 +63,5 @@ field_width for text fields: the width of the field (number of characters) default default value (required) - + supplementary: (list of recommended additional signs) id the id of the supplementary sign @@ -46,22 +70,20 @@ - + + de.wiki="DE:Tag:junction=roundabout"> - + @@ -69,5 +91,5 @@ - + @@ -87,5 +109,5 @@ - + @@ -139,5 +161,5 @@ - + @@ -154,7 +176,7 @@ - + - + @@ -206,10 +228,10 @@ - + - + - - - - + + + + - + - + - + @@ -250,12 +274,12 @@ - - - @@ -268,5 +292,5 @@ - + @@ -274,5 +298,5 @@ - + @@ -283,9 +307,9 @@ - + - + @@ -331,9 +355,9 @@ - + - + @@ -344,8 +368,8 @@ - + + de.long_name="Nur Kraftfahrzeuge mit einem zulässigen Gesamtgewicht über 3,5 t, einschl. ihrer Anhänger, und Zugmaschinen, ausgenommen Personenkraftwagen und Kraftomnibusse"> Index: /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java =================================================================== --- /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (revision 21994) +++ /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (revision 21995) @@ -33,8 +33,11 @@ import javax.swing.Scrollable; import javax.swing.SwingConstants; +import javax.swing.SwingUtilities; import javax.swing.border.Border; import javax.swing.border.EtchedBorder; import javax.swing.event.DocumentEvent; import javax.swing.event.DocumentListener; +import javax.swing.event.HyperlinkEvent; +import javax.swing.event.HyperlinkListener; import javax.swing.table.AbstractTableModel; @@ -49,4 +52,5 @@ import org.openstreetmap.josm.plugins.roadsigns.Sign.SignParameter; import org.openstreetmap.josm.plugins.roadsigns.Sign.Tag; +import org.openstreetmap.josm.tools.OpenBrowser; import org.openstreetmap.josm.tools.Pair; @@ -74,4 +78,5 @@ private JPanel pnlPossibleSupplements; private JEditorPane info; + private JScrollPane scrollInfo; public RoadSignInputDialog(List signs) { @@ -126,5 +131,4 @@ pnlSignSelection.setLayout(fLayout); - pnlPossibleSigns = new FixedWidthPanel(); pnlPossibleSupplements = new FixedWidthPanel(); @@ -146,8 +150,19 @@ info.setEditable(false); info.setContentType("text/html"); - info.setText(""); + info.setText(" "); info.setBackground(this.getBackground()); - JScrollPane scroll3 = new JScrollPane(info, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - multiSplitPane.add(scroll3, "bottom"); + info.addHyperlinkListener(new HyperlinkListener() { + public void hyperlinkUpdate(HyperlinkEvent e) { + if (e == null || e.getURL() == null) + return; + System.err.println(e.getURL()); + if (e.getEventType() == HyperlinkEvent.EventType.ACTIVATED) { + OpenBrowser.displayUrl(e.getURL().toString()); + } + } + }); + + scrollInfo = new JScrollPane(info, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + multiSplitPane.add(scrollInfo, "bottom"); return multiSplitPane; @@ -162,4 +177,11 @@ for (Sign s : signs) { JLabel lbl = new JLabel(s.getIcon()); + String tt = ""+s.name; + String ref = s.getDefaultRef(); + if (ref != null) { + tt += " ("+ref+")"; + } + tt += ""; + lbl.setToolTipText(tt); s.label = lbl; lbl.addMouseListener(new SignClickListener(s)); @@ -621,27 +643,43 @@ @Override public void mouseClicked(MouseEvent e) { + info.setText(longText()); + /* scroll up again */ + SwingUtilities.invokeLater(new Runnable(){ + public void run() { + scrollInfo.getVerticalScrollBar().setValue(0); + } + }); sel.add(sign); } - @Override - public void mouseEntered(MouseEvent e) { + private String longText() { StringBuilder txt = new StringBuilder(); - txt.append("

"); - txt.append(sign.name); - txt.append(""); + txt.append(sign.long_name == null ? sign.name : sign.long_name); String ref = sign.getDefaultRef(); if (ref != null) { txt.append(" ("+ref+")"); } - txt.append("

"); -// if (sign.long_name != null) { -// txt.append("("+sign.long_name+")"); -// } - info.setText(txt.toString()); - } - - @Override - public void mouseExited(MouseEvent e) { - info.setText(""); + + if (sign.help != null) { + txt.append("

"); + txt.append(sign.help); + txt.append("

"); + } + + if (sign.wiki != null || sign.loc_wiki != null) { + String wikiPrefix = "http://wiki.openstreetmap.org/wiki/"; + txt.append("

"); + if (sign.loc_wiki != null) { + String link = wikiPrefix+sign.loc_wiki; + txt.append(""+link+""); + txt.append("
"); + } + if (sign.wiki != null && ! sign.wiki.equals(sign.loc_wiki)) { + String link = wikiPrefix+sign.wiki; + txt.append(""+link+""); + } + txt.append("

"); + } + return txt.toString(); } } @@ -660,47 +698,47 @@ @Override public void setBounds(int x, int y, int width, int height) { - super.setBounds(x, y, getParent().getWidth(), height); - } + super.setBounds(x, y, getParent().getWidth(), height); + } @Override - public Dimension getPreferredSize() { - return new Dimension(getWidth(), getPreferredHeight()); - } - - public Dimension getPreferredScrollableViewportSize() { - return super.getPreferredSize(); - } - - public int getScrollableUnitIncrement( Rectangle visibleRect, int orientation, int direction ) { + public Dimension getPreferredSize() { + return new Dimension(getWidth(), getPreferredHeight()); + } + + public Dimension getPreferredScrollableViewportSize() { + return super.getPreferredSize(); + } + + public int getScrollableUnitIncrement( Rectangle visibleRect, int orientation, int direction ) { final int FRAC = 20; - int inc = (orientation == SwingConstants.VERTICAL ? getParent().getHeight() : getParent().getWidth()) / FRAC; - return Math.max(inc, 1); - } - - public int getScrollableBlockIncrement( Rectangle visibleRect, int orientation, int direction ) { - return orientation == SwingConstants.VERTICAL ? getParent().getHeight() : getParent().getWidth(); - } - - public boolean getScrollableTracksViewportWidth() { - return true; - } - - public boolean getScrollableTracksViewportHeight() { - return false; - } - - private int getPreferredHeight() { - int prefH = 0; + int inc = (orientation == SwingConstants.VERTICAL ? getParent().getHeight() : getParent().getWidth()) / FRAC; + return Math.max(inc, 1); + } + + public int getScrollableBlockIncrement( Rectangle visibleRect, int orientation, int direction ) { + return orientation == SwingConstants.VERTICAL ? getParent().getHeight() : getParent().getWidth(); + } + + public boolean getScrollableTracksViewportWidth() { + return true; + } + + public boolean getScrollableTracksViewportHeight() { + return false; + } + + private int getPreferredHeight() { + int prefH = 0; int num = getComponentCount(); - for (int i = 0; i < num; ++i) { - Rectangle rect = getComponent(i).getBounds(); - int h = rect.y + rect.height; - if (h > prefH) { - prefH = h; - } - } - prefH += ((FlowLayout) getLayout()).getVgap(); - return prefH; - } + for (int i = 0; i < num; ++i) { + Rectangle rect = getComponent(i).getBounds(); + int h = rect.y + rect.height; + if (h > prefH) { + prefH = h; + } + } + prefH += ((FlowLayout) getLayout()).getVgap(); + return prefH; + } } } Index: /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java =================================================================== --- /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (revision 21994) +++ /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsPlugin.java (revision 21995) @@ -31,7 +31,7 @@ public class RoadSignsPlugin extends Plugin { - private static boolean presetsLoaded = false; public static List signs; + static List iconDirs; public RoadSignsPlugin(PluginInformation info) { @@ -68,6 +68,13 @@ presetsLoaded=true; List files = new ArrayList( - Main.pref.getCollection("plugin.roadsign.sources", - Collections.singletonList("resource://data/defaultroadsignpreset.xml"))); + Main.pref.getCollection("plugin.roadsign.sources", + Collections.singletonList("resource://data/defaultroadsignpreset.xml"))); + iconDirs = new ArrayList( + Main.pref.getCollection("plugin.roadsign.icon.sources", Collections.emptySet())); + + if (Main.pref.getBoolean("plugin.roadsign.use_default_icon_source", true)) { + iconDirs.add("resource://images/"); + } + for (String source : files) { try { Index: /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java =================================================================== --- /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java (revision 21994) +++ /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignsReader.java (revision 21995) @@ -107,4 +107,9 @@ curSign.isSupplementing = true; } + + curSign.wiki = atts.getValue("wiki"); + curSign.loc_wiki = getLocalized(atts, "wiki"); + + curSign.help = getLocalized(atts, "help"); } else if (curSign != null && qname.equals("tag")) { Index: /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java =================================================================== --- /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java (revision 21994) +++ /applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/Sign.java (revision 21995) @@ -30,4 +30,7 @@ public List params = new ArrayList(); public boolean isSupplementing; + public String loc_wiki; + public String wiki; + public String help; public JLabel label; // FIXME: don't put gui stuff here @@ -78,5 +81,5 @@ public ImageIcon getIcon() { if (icon == null) { - icon = ImageProvider.get(iconURL); + icon = ImageProvider.getIfAvailable(RoadSignsPlugin.iconDirs, "plugin.sign."+id, null, iconURL, null); } return icon;