Changeset 250 in tmcsimulator

Timestamp:

02/09/2019 08:39:56 AM (7 years ago)

Author:

jdalbey

Message:

Add atms_map_proto_30sec.html Google Map atms prototype: reads local highways.json file

Location:

trunk

Files:

• IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml (modified) (4 diffs)
• IDE_metadata/NetBeans/TMCSim/nbproject/genfiles.properties (modified) (1 diff)
• IDE_metadata/NetBeans/TMCSim/nbproject/project.properties (modified) (2 diffs)
• atms_map_proto_30sec.html (added)
• camera_status.log (deleted)
• config/atms_driver_config.properties (modified) (1 diff)
• config/traffic_model_config.properties (modified) (1 diff)
• exchange.xml (modified) (1 diff)
• paramics_status.log (deleted)

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/build-impl.xml

@@ -451 +451 @@
                 </union>
                 <taskdef classname="org.testng.TestNGAntTask" classpath="${run.test.classpath}" name="testng"/>
-                <testng classfilesetref="test.set" failureProperty="tests.failed" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="TMCSim" testname="TestNG tests" workingDir="${work.dir}">
+                <testng classfilesetref="test.set" failureProperty="tests.failed" jvm="${platform.java}" listeners="org.testng.reporters.VerboseReporter" methods="${testng.methods.arg}" mode="${testng.mode}" outputdir="${build.test.results.dir}" suitename="TMCSim" testname="TestNG tests" workingDir="${work.dir}">
                     <xmlfileset dir="${build.test.classes.dir}" includes="@{testincludes}"/>
                     <propertyset>
@@ -776 +776 @@
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg line="${debug-args-line}"/>
@@ -803 +803 @@
             <element name="customize" optional="true"/>
             <sequential>
-                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true">
+                <java classname="@{classname}" dir="${work.dir}" failonerror="${java.failonerror}" fork="true" jvm="${platform.java}">
                     <jvmarg line="${endorsed.classpath.cmd.line.arg}"/>
                     <jvmarg value="-Dfile.encoding=${runtime.encoding}"/>
@@ -1210 +1210 @@
             </and>
         </condition>
+        <exec executable="${platform.java}" failonerror="false" outputproperty="platform.version.output">
+            <arg value="-version"/>
+        </exec>
         <condition else="" property="bug5101868workaround" value="*.java">
-            <matches pattern="1\.[56](\..*)?" string="${java.version}"/>
-        </condition>
-        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
+            <matches multiline="true" pattern="1\.[56](\..*)?" string="${platform.version.output}"/>
+        </condition>
+        <javadoc additionalparam="-J-Dfile.encoding=${file.encoding} ${javadoc.additionalparam}" author="${javadoc.author}" charset="UTF-8" destdir="${dist.javadoc.dir}" docencoding="UTF-8" encoding="${javadoc.encoding.used}" executable="${platform.javadoc}" failonerror="true" noindex="${javadoc.noindex}" nonavbar="${javadoc.nonavbar}" notree="${javadoc.notree}" private="${javadoc.private}" source="${javac.source}" splitindex="${javadoc.splitindex}" use="${javadoc.use}" useexternalfile="true" version="${javadoc.version}" windowtitle="${javadoc.windowtitle}">
             <classpath>
                 <path path="${javac.classpath}"/>

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/genfiles.properties

@@ -4 +4 @@
 # This file is used by a NetBeans-based IDE to track changes in generated files such as build-impl.xml.
 # Do not edit this file. You may delete it but then the IDE will never regenerate such files for you.
-nbproject/build-impl.xml.data.CRC32=6c7221c6
-nbproject/build-impl.xml.script.CRC32=249c9218
+nbproject/build-impl.xml.data.CRC32=e14f63c1
+nbproject/build-impl.xml.script.CRC32=57adea56
 nbproject/build-impl.xml.stylesheet.CRC32=830a3534@1.80.1.48

trunk/IDE_metadata/NetBeans/TMCSim/nbproject/project.properties

@@ -1 @@
-#Wed Oct 11 09:26:31 PDT 2017
+#Fri Oct 06 15:14:08 PDT 2017
 excludes=
 file.reference.TimeSelector_r13.jar=../../../lib/TimeSelector_r13.jar
@@ -51 +51 @@
     ${javac.classpath}:\
     ${build.classes.dir}:\
-    ${libs.junit_4.classpath}
+    ${libs.junit_4.classpath}:\
+    ${libs.hamcrest.classpath}
 build.generated.dir=${build.dir}/generated
 jar.compress=false

trunk/config/atms_driver_config.properties

@@ -3 +3 @@
 FEPWriterHost = 192.168.251.46
 FEPWriterPort = 8080
+Output_Destination = console

trunk/config/traffic_model_config.properties

@@ -2 +2 @@
 Events_File = config/vds_data/atmsBatchEvents.txt
 FEPSim_IP_addr = 192.168.251.46
-Output_Destination = FEP
+Output_Destination = console
 
+

trunk/exchange.xml

@@ +1 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<CAD_DATA>
+    <Basic>
+        <Comm_Interval>30</Comm_Interval>
+        <Network_ID>1</Network_ID>
+        <Simulation>FALSE</Simulation>
+        <Incident>FALSE</Incident>
+    </Basic>
+</CAD_DATA>