From e5996132cc05197cd051a037844eb4519b24a11e Mon Sep 17 00:00:00 2001
From: Michael Behrisch <oss@behrisch.de>
Date: Sat, 18 Jan 2014 11:59:53 +0000
Subject: [PATCH] adapting config schemas, refs #2, #21

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15432 afbd958f-9f77-42d5-a016-97a22340ccf4
---
 sumo/docs/internet/xsd/activitygenConfiguration.xsd | 2 +-
 sumo/docs/internet/xsd/dfrouterConfiguration.xsd    | 2 +-
 sumo/docs/internet/xsd/duarouterConfiguration.xsd   | 2 +-
 sumo/docs/internet/xsd/jtrrouterConfiguration.xsd   | 2 +-
 sumo/docs/internet/xsd/marouterConfiguration.xsd    | 2 +-
 sumo/docs/internet/xsd/netconvertConfiguration.xsd  | 3 ++-
 sumo/docs/internet/xsd/netgenerateConfiguration.xsd | 2 +-
 sumo/docs/internet/xsd/od2tripsConfiguration.xsd    | 2 +-
 sumo/docs/internet/xsd/polyconvertConfiguration.xsd | 2 +-
 sumo/docs/internet/xsd/sumoConfiguration.xsd        | 3 ++-
 10 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/sumo/docs/internet/xsd/activitygenConfiguration.xsd b/sumo/docs/internet/xsd/activitygenConfiguration.xsd
index ee3a39f05002..882d081ffe53 100644
--- a/sumo/docs/internet/xsd/activitygenConfiguration.xsd
+++ b/sumo/docs/internet/xsd/activitygenConfiguration.xsd
@@ -50,7 +50,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/dfrouterConfiguration.xsd b/sumo/docs/internet/xsd/dfrouterConfiguration.xsd
index 75f623c35319..c9f6a5529684 100644
--- a/sumo/docs/internet/xsd/dfrouterConfiguration.xsd
+++ b/sumo/docs/internet/xsd/dfrouterConfiguration.xsd
@@ -93,7 +93,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/duarouterConfiguration.xsd b/sumo/docs/internet/xsd/duarouterConfiguration.xsd
index d111a2442086..40a761909264 100644
--- a/sumo/docs/internet/xsd/duarouterConfiguration.xsd
+++ b/sumo/docs/internet/xsd/duarouterConfiguration.xsd
@@ -89,7 +89,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/jtrrouterConfiguration.xsd b/sumo/docs/internet/xsd/jtrrouterConfiguration.xsd
index e89e1214957b..9fac201b8c2c 100644
--- a/sumo/docs/internet/xsd/jtrrouterConfiguration.xsd
+++ b/sumo/docs/internet/xsd/jtrrouterConfiguration.xsd
@@ -79,7 +79,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/marouterConfiguration.xsd b/sumo/docs/internet/xsd/marouterConfiguration.xsd
index fa99206ea545..54d6e9230a69 100644
--- a/sumo/docs/internet/xsd/marouterConfiguration.xsd
+++ b/sumo/docs/internet/xsd/marouterConfiguration.xsd
@@ -95,7 +95,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/netconvertConfiguration.xsd b/sumo/docs/internet/xsd/netconvertConfiguration.xsd
index 2a23b3cf538c..e563a7f8b2b5 100644
--- a/sumo/docs/internet/xsd/netconvertConfiguration.xsd
+++ b/sumo/docs/internet/xsd/netconvertConfiguration.xsd
@@ -172,6 +172,7 @@
             <xsd:element name="geometry.max-angle" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="geometry.min-radius" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="geometry.min-radius.fix" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="geometry.junction-mismatch-threshold" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="offset.disable-normalization" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="offset.x" type="floatOptionType" minOccurs="0"/>
             <xsd:element name="offset.y" type="floatOptionType" minOccurs="0"/>
@@ -203,7 +204,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/netgenerateConfiguration.xsd b/sumo/docs/internet/xsd/netgenerateConfiguration.xsd
index cc8c8d09958b..a8bc6a754b46 100644
--- a/sumo/docs/internet/xsd/netgenerateConfiguration.xsd
+++ b/sumo/docs/internet/xsd/netgenerateConfiguration.xsd
@@ -149,7 +149,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/od2tripsConfiguration.xsd b/sumo/docs/internet/xsd/od2tripsConfiguration.xsd
index a791665c1965..48be8a3bd284 100644
--- a/sumo/docs/internet/xsd/od2tripsConfiguration.xsd
+++ b/sumo/docs/internet/xsd/od2tripsConfiguration.xsd
@@ -69,7 +69,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/polyconvertConfiguration.xsd b/sumo/docs/internet/xsd/polyconvertConfiguration.xsd
index 0d816b8603e2..2562f11016a6 100644
--- a/sumo/docs/internet/xsd/polyconvertConfiguration.xsd
+++ b/sumo/docs/internet/xsd/polyconvertConfiguration.xsd
@@ -88,7 +88,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
diff --git a/sumo/docs/internet/xsd/sumoConfiguration.xsd b/sumo/docs/internet/xsd/sumoConfiguration.xsd
index c47e37bd6881..159e43e7362b 100644
--- a/sumo/docs/internet/xsd/sumoConfiguration.xsd
+++ b/sumo/docs/internet/xsd/sumoConfiguration.xsd
@@ -97,7 +97,7 @@
             <xsd:element name="print-options" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="help" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="version" type="boolOptionType" minOccurs="0"/>
-            <xsd:element name="xml-validation" type="boolOptionType" minOccurs="0"/>
+            <xsd:element name="xml-validation" type="strOptionType" minOccurs="0"/>
             <xsd:element name="no-warnings" type="boolOptionType" minOccurs="0"/>
             <xsd:element name="log" type="fileOptionType" minOccurs="0"/>
             <xsd:element name="message-log" type="fileOptionType" minOccurs="0"/>
@@ -152,6 +152,7 @@
     <xsd:complexType name="traci_serverType">
         <xsd:all>
             <xsd:element name="remote-port" type="intOptionType" minOccurs="0"/>
+            <xsd:element name="python-script" type="strOptionType" minOccurs="0"/>
         </xsd:all>
     </xsd:complexType>