Merge pull request #4 from DenisCobeti/develop

version 0.4
DenisCobeti · Sep 15, 2020 · 636001a · 636001a
2 parents ab680a5 + 11c893b
commit 636001a
Show file tree

Hide file tree

Showing 52 changed files with 4,558 additions and 70,307 deletions.
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/10/510/385.png b/cache.jxmapviewer2/tile.openstreetmap.org/10/510/385.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/10/510/386.png b/cache.jxmapviewer2/tile.openstreetmap.org/10/510/386.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/10/510/387.png b/cache.jxmapviewer2/tile.openstreetmap.org/10/510/387.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/11/1019/772.png b/cache.jxmapviewer2/tile.openstreetmap.org/11/1019/772.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/11/1019/773.png b/cache.jxmapviewer2/tile.openstreetmap.org/11/1019/773.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/11/1019/774.png b/cache.jxmapviewer2/tile.openstreetmap.org/11/1019/774.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/12/2034/1544.png b/cache.jxmapviewer2/tile.openstreetmap.org/12/2034/1544.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/12/2035/1544.png b/cache.jxmapviewer2/tile.openstreetmap.org/12/2035/1544.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/12/2036/1544.png b/cache.jxmapviewer2/tile.openstreetmap.org/12/2036/1544.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/12/2037/1544.png b/cache.jxmapviewer2/tile.openstreetmap.org/12/2037/1544.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/12/2037/1545.png b/cache.jxmapviewer2/tile.openstreetmap.org/12/2037/1545.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/12/2037/1546.png b/cache.jxmapviewer2/tile.openstreetmap.org/12/2037/1546.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/14/8139/6181.png b/cache.jxmapviewer2/tile.openstreetmap.org/14/8139/6181.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/14/8139/6182.png b/cache.jxmapviewer2/tile.openstreetmap.org/14/8139/6182.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/14/8139/6183.png b/cache.jxmapviewer2/tile.openstreetmap.org/14/8139/6183.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/7/61/47.png b/cache.jxmapviewer2/tile.openstreetmap.org/7/61/47.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/7/61/48.png b/cache.jxmapviewer2/tile.openstreetmap.org/7/61/48.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/7/61/49.png b/cache.jxmapviewer2/tile.openstreetmap.org/7/61/49.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/7/65/42.png b/cache.jxmapviewer2/tile.openstreetmap.org/7/65/42.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/7/65/43.png b/cache.jxmapviewer2/tile.openstreetmap.org/7/65/43.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/7/65/44.png b/cache.jxmapviewer2/tile.openstreetmap.org/7/65/44.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/8/125/98.png b/cache.jxmapviewer2/tile.openstreetmap.org/8/125/98.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/8/126/98.png b/cache.jxmapviewer2/tile.openstreetmap.org/8/126/98.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/8/127/98.png b/cache.jxmapviewer2/tile.openstreetmap.org/8/127/98.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/8/132/85.png b/cache.jxmapviewer2/tile.openstreetmap.org/8/132/85.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/8/132/86.png b/cache.jxmapviewer2/tile.openstreetmap.org/8/132/86.png
diff --git a/cache.jxmapviewer2/tile.openstreetmap.org/8/132/87.png b/cache.jxmapviewer2/tile.openstreetmap.org/8/132/87.png
diff --git a/config.properties b/config.properties
@@ -1,2 +1,5 @@
-osmMapFile=maps/OSMap
+#Sun Sep 13 14:10:17 CEST 2020
 netconvertMapFile=./maps/SUMOMap
+python=python2
+osmMapFile=maps/OSMap
+sumo=lib/Sumo
diff --git a/mapNetconvert.net.xml b/mapNetconvert.net.xml
diff --git a/models/od/flows.rou.xml b/models/od/flows.rou.xml
diff --git a/models/od/mapNetconvert.fcd b/models/od/mapNetconvert.fcd
diff --git a/models/od/od.or b/models/od/od.or
@@ -1,4 +1,4 @@
 $OR
 0.0 1.0
 1.00
-1   2  40.00
+d1   d2  40.00
diff --git a/models/od/tazs.taz.xml b/models/od/tazs.taz.xml
@@ -1,4 +1,4 @@
 <tazs>
-<taz id="1" edges="-825926549#0 825926549#0 -521709868 825926549#1 " />
-<taz id="2" edges="-47419212#3 228371110 228371102#1 47419211 228371107#1 47419214#1 47419214#2 47419214#5 " />
+<taz id="d1" edges="148754587#0 148754587#0 148754587#0 148754587#0 148754587#0 4793114#0 4793114#0 4793114#0 472503795 472503795 " />
+<taz id="d2" edges="-504582669 -504582669 49499523 49499523 5069579#0 -5069579#2 4834461#0 -5069579#3 5069579#3 " />
 </tazs>
diff --git a/models/od/trips.trips.xml b/models/od/trips.trips.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<!-- generated on 08/31/20 01:31:21 by Eclipse SUMO od2trips Version 1.2.0
+<!-- generated on 09/15/20 23:36:39 by Eclipse SUMO od2trips Version 1.2.0
 <configuration xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/od2tripsConfiguration.xsd">
 
     <input>
@@ -20,44 +20,44 @@
 -->
 
 <routes xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://sumo.dlr.de/xsd/routes_file.xsd">
-    <trip id="9" depart="18.39" from="825926549#1" to="228371110" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="5" depart="55.65" from="-825926549#0" to="228371107#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="19" depart="163.02" from="-825926549#0" to="-47419212#3" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="27" depart="238.38" from="825926549#0" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="7" depart="381.92" from="825926549#1" to="47419211" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="33" depart="423.68" from="-521709868" to="-47419212#3" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="30" depart="433.87" from="825926549#0" to="47419211" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="26" depart="436.43" from="-521709868" to="47419214#2" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="1" depart="476.94" from="-825926549#0" to="47419214#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="15" depart="674.42" from="-521709868" to="228371107#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="17" depart="724.95" from="825926549#0" to="228371107#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="3" depart="754.69" from="-521709868" to="47419211" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="14" depart="764.28" from="825926549#1" to="-47419212#3" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="24" depart="842.52" from="825926549#0" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="16" depart="869.60" from="825926549#1" to="47419214#5" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="12" depart="912.02" from="825926549#1" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="29" depart="972.03" from="825926549#1" to="47419214#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="39" depart="1038.84" from="825926549#1" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="11" depart="1086.27" from="-825926549#0" to="228371110" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="28" depart="1118.06" from="-825926549#0" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="35" depart="1302.21" from="-825926549#0" to="47419214#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="8" depart="1580.77" from="-825926549#0" to="-47419212#3" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="22" depart="1651.42" from="825926549#0" to="-47419212#3" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="32" depart="1763.21" from="825926549#1" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="6" depart="1817.33" from="-521709868" to="47419214#5" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="2" depart="1847.70" from="-521709868" to="47419214#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="18" depart="1848.48" from="825926549#1" to="228371110" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="25" depart="1943.63" from="-521709868" to="47419211" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="13" depart="2039.96" from="-825926549#0" to="228371107#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="34" depart="2169.75" from="-521709868" to="47419214#2" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="20" depart="2239.54" from="-521709868" to="47419214#5" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="38" depart="2264.40" from="825926549#1" to="47419214#2" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="37" depart="2276.89" from="-825926549#0" to="47419211" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="36" depart="2279.74" from="825926549#1" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="10" depart="2300.46" from="-825926549#0" to="47419214#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="21" depart="2436.32" from="-825926549#0" to="47419214#5" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="0" depart="2488.08" from="-825926549#0" to="47419211" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="4" depart="2950.16" from="825926549#1" to="228371102#1" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="23" depart="3181.59" from="-825926549#0" to="228371110" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
-    <trip id="31" depart="3381.69" from="825926549#0" to="47419214#2" type="dist" fromTaz="1" toTaz="2" departLane="free" departSpeed="max"/>
+    <trip id="9" depart="18.39" from="4793114#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="5" depart="55.65" from="148754587#0" to="5069579#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="19" depart="163.02" from="148754587#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="27" depart="238.38" from="148754587#0" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="7" depart="381.92" from="472503795" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="33" depart="423.68" from="4793114#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="30" depart="433.87" from="148754587#0" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="26" depart="436.43" from="4793114#0" to="-5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="1" depart="476.94" from="148754587#0" to="4834461#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="15" depart="674.42" from="4793114#0" to="-5069579#2" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="17" depart="724.95" from="148754587#0" to="-5069579#2" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="3" depart="754.69" from="4793114#0" to="5069579#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="14" depart="764.28" from="472503795" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="24" depart="842.52" from="148754587#0" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="16" depart="869.60" from="472503795" to="5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="12" depart="912.02" from="472503795" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="29" depart="972.03" from="472503795" to="-5069579#2" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="39" depart="1038.84" from="472503795" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="11" depart="1086.27" from="148754587#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="28" depart="1118.06" from="148754587#0" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="35" depart="1302.21" from="148754587#0" to="4834461#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="8" depart="1580.77" from="148754587#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="22" depart="1651.42" from="148754587#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="32" depart="1763.21" from="472503795" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="6" depart="1817.33" from="4793114#0" to="5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="2" depart="1847.70" from="4793114#0" to="4834461#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="18" depart="1848.48" from="472503795" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="25" depart="1943.63" from="4793114#0" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="13" depart="2039.96" from="148754587#0" to="-5069579#2" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="34" depart="2169.75" from="4793114#0" to="-5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="20" depart="2239.54" from="4793114#0" to="5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="38" depart="2264.40" from="472503795" to="-5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="37" depart="2276.89" from="148754587#0" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="36" depart="2279.74" from="472503795" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="10" depart="2300.46" from="148754587#0" to="4834461#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="21" depart="2436.32" from="148754587#0" to="5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="0" depart="2488.08" from="148754587#0" to="5069579#0" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="4" depart="2950.16" from="472503795" to="49499523" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="23" depart="3181.59" from="148754587#0" to="-504582669" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
+    <trip id="31" depart="3381.69" from="148754587#0" to="-5069579#3" type="dist" fromTaz="d1" toTaz="d2" departLane="free" departSpeed="max"/>
 </routes>