Changeset 22423 in osm for applications/editors/josm/plugins

Timestamp:

2010-07-22T20:55:24+02:00 (14 years ago)

Author:

bastik

Message:

'preset maintenance'

Location:

applications/editors/josm/plugins/roadsigns

Files:

• build.xml (modified) (1 diff)
• data/defaultroadsignpreset.xml (modified) (10 diffs)
• src/org/openstreetmap/josm/plugins/roadsigns/RoadSignInputDialog.java (modified) (1 diff)

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

@@ -31 +31 @@
 
         <!-- enter the SVN commit message -->
-        <property name="commit.message" value="added support for traffic_sign tag" />
+        <property name="commit.message" value="preset maintenance" />
         <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
         <property name="plugin.main.version" value="3338" />

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

@@ -91 +91 @@
     </sign>
 
-    <sign id="oneway" icon="DE_220;DE_267" name="One-way road" de.name="Einbahnstraße">  <!--ref="DE:220;DE:267"-->
+    <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"
+            wiki="Key:oneway"
+            de.wiki="DE:Key:oneway">
         <tag key="oneway" value="yes"/>
 <!--        <supplementary id="DE:1022-10;DE:1000-33"/>-->
@@ -143 +145 @@
     </sign>
 
-    <sign ref="DE:242" name="Pedestrian zone" de.name="Fußgängerbereich">
+    <sign ref="DE:242" name="Pedestrian zone" de.name="Fußgängerbereich"
+            wiki="Tag:highway%3Dpedestrian"
+            de.wiki="DE:Tag:highway%3Dpedestrian">
         <tag key="highway" value="pedestrian"/>
         <tag key="access" value="" ident="mode"/>
@@ -174 +178 @@
         <supplementary id="DE:1022-11"/> <!-- Mofas frei -->
         <supplementary id="DE:1022-12"/> <!-- Krafträder frei -->
+        <supplementary id="DE:1024-12"/> <!-- LKW frei -->
+        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
         <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
         <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
@@ -189 +195 @@
         <tag key="motorcar" value="no" ident="mode"/>
         <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
+        <supplementary id="DE:1024-12"/> <!-- LKW frei -->
+        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
         <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
         <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
@@ -202 +210 @@
             wiki="Key:hgv"
             de.wiki="DE:Key:access">
-        <tag key="motorcar" value="no" ident="mode"/>
-        <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
+        <tag key="hgv" value="no" ident="mode"/>
+        <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
+        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
         <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
         <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
@@ -245 +254 @@
         <supplementary id="DE:1020-30"/> <!-- Anlieger frei -->
         <supplementary id="DE:1022-11"/> <!-- Mofas frei -->
+        <supplementary id="DE:1024-12"/> <!-- LKW frei -->
+        <supplementary id="DE:1024-14"/> <!-- Bus frei -->
         <supplementary id="DE:1026-30"/> <!-- Taxi frei -->
         <supplementary id="DE:1026-32"/> <!-- Linienverkehr frei -->
@@ -259 +270 @@
     </sign>
 
-    <sign ref="DE:262[$val]" icon="DE_262" name="Weight limit" de.name="Tatsächliches Gewicht" wiki="Key:maxweight">
+    <sign ref="DE:262[$val]" icon="DE_262" name="Weight limit" de.name="Tatsächliches Gewicht"
+            wiki="Key:maxweight">
         <tag key="maxweight" value="$val"/>
         <parameter ident="val" input="textfield" default="5.5" suffix="t" field_width="3"/>
     </sign>
 
-    <sign ref="DE:263[$val]" icon="DE_263" name="Axle weight limit" de.name="Tatsächliche Achslast" wiki="Key:maxaxleload">
+    <sign ref="DE:263[$val]" icon="DE_263" name="Axle weight limit" de.name="Tatsächliche Achslast"
+            wiki="Key:maxaxleload">
         <tag key="maxaxleload" value="$val"/>
         <parameter ident="val" input="textfield" default="8" suffix="t" field_width="3"/>
     </sign>
 
-    <sign ref="DE:264[$val]" icon="DE_264" name="Width limit" de.name="Tatsächliche Breite">
+    <sign ref="DE:264[$val]" icon="DE_264" name="Width limit" de.name="Tatsächliche Breite"
+            wiki="Key:maxwidth">
         <tag key="maxwidth" value="$val"/>
         <parameter ident="val" input="textfield" default="2" suffix="m" field_width="3"/>
     </sign>
 
-    <sign ref="DE:265[$val]" icon="DE_265" name="Height limit" de.name="Tatsächliche Höhe">
+    <sign ref="DE:265[$val]" icon="DE_265" name="Height limit" de.name="Tatsächliche Höhe"
+            wiki="Key:maxheight"
+            de.wiki="DE:Key:maxheight">
         <tag key="maxheight" value="$val"/>
         <parameter ident="val" input="textfield" default="3.8" suffix="m" field_width="3"/>
@@ -291 +307 @@
     </sign>
 
-    <sign ref="DE:274[$val]" icon="DE_274" name="Speed limit" de.name="Zulässige Höchstgeschwindigkeit">
+    <sign ref="DE:274[$val]" icon="DE_274" name="Speed limit" de.name="Zulässige Höchstgeschwindigkeit"
+            wiki="Key:maxspeed"
+            de.wiki="DE:Key:maxspeed">
         <tag key="maxspeed" value="$val" ident="restriction"/>
         <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"/>
@@ -304 +322 @@
     </sign>
 
-    <sign ref="DE:275[$val]" icon="DE_275" name="Minimum speed limit" de.name="Vorgeschriebene Mindestgeschwindigkeit" wiki="Key:minspeed">
+    <sign ref="DE:275[$val]" icon="DE_275" name="Minimum speed limit" de.name="Vorgeschriebene Mindestgeschwindigkeit"
+            wiki="Key:minspeed">
         <tag key="minspeed" value="$val"/>
         <parameter ident="val" input="textfield" suffix="km/h" default="30" field_width="2"/>
     </sign>
 
-    <sign ref="DE:325" name="Traffic calming zone" de.name="Verkehrsberuhigter Bereich">
+    <sign ref="DE:325" name="Traffic calming zone" de.name="Verkehrsberuhigter Bereich"
+            wiki="Tag:highway%3Dliving_street"
+            de.wiki="DE:Tag:highway%3Dliving_street">
         <tag key="highway" value="living_street"/>
     </sign>
 
-    <sign ref="DE:327" name="Tunnel" de.name="Tunnel">
+    <sign ref="DE:327" name="Tunnel" de.name="Tunnel"
+            wiki="Key:tunnel"
+            de.wiki="DE:Key:tunnel">
         <tag key="tunnel" value="yes"/>
     </sign>
@@ -349 +372 @@
 <!--    </sign>-->
 
+    <sign ref="DE:1024-12" supplementary="yes" name="Heavy goods vehicles allowed" de.name="LKW frei"
+        long_name="Vehicles with a permitted gross weight over 3.5 t including their trailers, except passenger cars and busses, allowed"
+        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">
+        <tag key="hgv" value="yes"/>
+    </sign>
+
+    <sign ref="DE:1024-14" supplementary="yes" name="Bus allowed" de.name="Kraftomnibus frei">
+        <tag key="bus" value="yes"/>
+    </sign>
+
     <sign ref="DE:1026-30" supplementary="yes" name="Taxi allowed" de.name="Taxi frei">
         <tag key="taxi" value="yes"/>
     </sign>
 
-    <sign ref="DE:1026-32" supplementary="yes" name="Public service vehicles allowed" de.name="Linienverkehr frei">
+    <sign ref="DE:1026-32" supplementary="yes" name="Public service vehicles allowed" de.name="Linienverkehr frei"
+            wiki="Key:psv">
         <tag key="psv" value="yes"/>
     </sign>

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

@@ -717 +717 @@
 
             if (sign.wiki != null || sign.loc_wiki != null) {
-                String wikiPrefix = "http://wiki.openstreetmap.org/wiki/";
+                String wikiPrefix = Main.main.pref.get("plugin.roadsigns.wikiprefix", "http://wiki.openstreetmap.org/wiki/");
                 txt.append("<p>");
                 if (sign.loc_wiki != null) {