Changeset 22423 in osm for applications


Ignore:
Timestamp:
2010-07-22T20:55:24+02:00 (14 years ago)
Author:
bastik
Message:

'preset maintenance'

Location:
applications/editors/josm/plugins/roadsigns
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/roadsigns/build.xml

    r22420 r22423  
    3131
    3232        <!-- enter the SVN commit message -->
    33         <property name="commit.message" value="added support for traffic_sign tag" />
     33        <property name="commit.message" value="preset maintenance" />
    3434        <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
    3535        <property name="plugin.main.version" value="3338" />

  • applications/editors/josm/plugins/roadsigns/data/defaultroadsignpreset.xml

    r22420 r22423  
    9191    </sign>
    9292
    93     <sign id="oneway" icon="DE_220;DE_267" name="One-way road" de.name="Einbahnstraße">  <!--ref="DE:220;DE:267"-->
     93    <sign id="oneway" ref="DE:220&amp;DE:267" traffic_sign_tag="" icon="DE_220;DE_267" name="One-way road" de.name="Einbahnstraße"
     94            wiki="Key:oneway"
     95            de.wiki="DE:Key:oneway">
    9496        <tag key="oneway" value="yes"/>
    9597<!--        <supplementary id="DE:1022-10;DE:1000-33"/>-->
    … …  
    143145    </sign>
    144146
    145     <sign ref="DE:242" name="Pedestrian zone" de.name="Fußgängerbereich">
     147    <sign ref="DE:242" name="Pedestrian zone" de.name="Fußgängerbereich"
     148            wiki="Tag:highway%3Dpedestrian"
     149            de.wiki="DE:Tag:highway%3Dpedestrian">
    146150        <tag key="highway" value="pedestrian"/>
    147151        <tag key="access" value="" ident="mode"/>
    … …  
    174178        <supplementary id="DE:1022-11"/> <!-- Mofas frei -->
    175179        <supplementary id="DE:1022-12"/> <!-- Krafträder frei -->
     180        <supplementary id="DE:1024-12"/> <!-- LKW frei -->
     181        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
    176182        <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
    177183        <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
    … …  
    189195        <tag key="motorcar" value="no" ident="mode"/>
    190196        <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
     197        <supplementary id="DE:1024-12"/> <!-- LKW frei -->
     198        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
    191199        <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
    192200        <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
    … …  
    202210            wiki="Key:hgv"
    203211            de.wiki="DE:Key:access">
    204         <tag key="motorcar" value="no" ident="mode"/>
    205         <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
     212        <tag key="hgv" value="no" ident="mode"/>
     213        <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
     214        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
    206215        <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
    207216        <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
    … …  
    245254        <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
    246255        <supplementary id="DE:1022-11"/> <!-- Mofas frei -->
     256        <supplementary id="DE:1024-12"/> <!-- LKW frei -->
     257        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
    247258        <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
    248259        <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
    … …  
    259270    </sign>
    260271
    261     <sign ref="DE:262[$val]" icon="DE_262" name="Weight limit" de.name="Tatsächliches Gewicht" wiki="Key:maxweight">
     272    <sign ref="DE:262[$val]" icon="DE_262" name="Weight limit" de.name="Tatsächliches Gewicht"
     273            wiki="Key:maxweight">
    262274        <tag key="maxweight" value="$val"/>
    263275        <parameter ident="val" input="textfield" default="5.5" suffix="t" field_width="3"/>
    264276    </sign>
    265277
    266     <sign ref="DE:263[$val]" icon="DE_263" name="Axle weight limit" de.name="Tatsächliche Achslast" wiki="Key:maxaxleload">
     278    <sign ref="DE:263[$val]" icon="DE_263" name="Axle weight limit" de.name="Tatsächliche Achslast"
     279            wiki="Key:maxaxleload">
    267280        <tag key="maxaxleload" value="$val"/>
    268281        <parameter ident="val" input="textfield" default="8" suffix="t" field_width="3"/>
    269282    </sign>
    270283
    271     <sign ref="DE:264[$val]" icon="DE_264" name="Width limit" de.name="Tatsächliche Breite">
     284    <sign ref="DE:264[$val]" icon="DE_264" name="Width limit" de.name="Tatsächliche Breite"
     285            wiki="Key:maxwidth">
    272286        <tag key="maxwidth" value="$val"/>
    273287        <parameter ident="val" input="textfield" default="2" suffix="m" field_width="3"/>
    274288    </sign>
    275289
    276     <sign ref="DE:265[$val]" icon="DE_265" name="Height limit" de.name="Tatsächliche Höhe">
     290    <sign ref="DE:265[$val]" icon="DE_265" name="Height limit" de.name="Tatsächliche Höhe"
     291            wiki="Key:maxheight"
     292            de.wiki="DE:Key:maxheight">
    277293        <tag key="maxheight" value="$val"/>
    278294        <parameter ident="val" input="textfield" default="3.8" suffix="m" field_width="3"/>
    … …  
    291307    </sign>
    292308
    293     <sign ref="DE:274[$val]" icon="DE_274" name="Speed limit" de.name="Zulässige Höchstgeschwindigkeit">
     309    <sign ref="DE:274[$val]" icon="DE_274" name="Speed limit" de.name="Zulässige Höchstgeschwindigkeit"
     310            wiki="Key:maxspeed"
     311            de.wiki="DE:Key:maxspeed">
    294312        <tag key="maxspeed" value="$val" ident="restriction"/>
    295313        <parameter ident="val" type="int" input="combo" editable="yes" text="speed-limit" de.text="Höchstgeschwindigkeit" suffix="km/h" values="5,10,20,30,40,50,60,70,80,90,100,110,120,130" default="60" field_width="3"/>
    … …  
    304322    </sign>
    305323
    306     <sign ref="DE:275[$val]" icon="DE_275" name="Minimum speed limit" de.name="Vorgeschriebene Mindestgeschwindigkeit" wiki="Key:minspeed">
     324    <sign ref="DE:275[$val]" icon="DE_275" name="Minimum speed limit" de.name="Vorgeschriebene Mindestgeschwindigkeit"
     325            wiki="Key:minspeed">
    307326        <tag key="minspeed" value="$val"/>
    308327        <parameter ident="val" input="textfield" suffix="km/h" default="30" field_width="2"/>
    309328    </sign>
    310329
    311     <sign ref="DE:325" name="Traffic calming zone" de.name="Verkehrsberuhigter Bereich">
     330    <sign ref="DE:325" name="Traffic calming zone" de.name="Verkehrsberuhigter Bereich"
     331            wiki="Tag:highway%3Dliving_street"
     332            de.wiki="DE:Tag:highway%3Dliving_street">
    312333        <tag key="highway" value="living_street"/>
    313334    </sign>
    314335
    315     <sign ref="DE:327" name="Tunnel" de.name="Tunnel">
     336    <sign ref="DE:327" name="Tunnel" de.name="Tunnel"
     337            wiki="Key:tunnel"
     338            de.wiki="DE:Key:tunnel">
    316339        <tag key="tunnel" value="yes"/>
    317340    </sign>
    … …  
    349372<!--    </sign>-->
    350373
     374    <sign ref="DE:1024-12" supplementary="yes" name="Heavy goods vehicles allowed" de.name="LKW frei"
     375        long_name="Vehicles with a permitted gross weight over 3.5 t including their trailers, except passenger cars and busses, allowed"
     376        de.long_name="Kraftfahrzeuge mit einem zulässigen Gesamtgewicht über 3,5 t, einschließlich ihrer Anhänger und Zugmaschinen, ausgenommen Personenkraftwagen und Kraftomnibusse frei">
     377        <tag key="hgv" value="yes"/>
     378    </sign>
     379
     380    <sign ref="DE:1024-14" supplementary="yes" name="Bus allowed" de.name="Kraftomnibus frei">
     381        <tag key="bus" value="yes"/>
     382    </sign>
     383
    351384    <sign ref="DE:1026-30" supplementary="yes" name="Taxi allowed" de.name="Taxi frei">
    352385        <tag key="taxi" value="yes"/>
    353386    </sign>
    354387
    355     <sign ref="DE:1026-32" supplementary="yes" name="Public service vehicles allowed" de.name="Linienverkehr frei">
     388    <sign ref="DE:1026-32" supplementary="yes" name="Public service vehicles allowed" de.name="Linienverkehr frei"
     389            wiki="Key:psv">
    356390        <tag key="psv" value="yes"/>
    357391    </sign>

  • applications/editors/josm/plugins/roadsigns/src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java

    r22420 r22423  
    717717
    718718            if (sign.wiki != null || sign.loc_wiki != null) {
    719                 String wikiPrefix = "http://wiki.openstreetmap.org/wiki/";
     719                String wikiPrefix = Main.main.pref.get("plugin.roadsigns.wikiprefix", "http://wiki.openstreetmap.org/wiki/");
    720720                txt.append("<p>");
    721721                if (sign.loc_wiki != null) {
Note: See TracChangeset for help on using the changeset viewer.