Merge origin/master

43c49d1e · Brutzman, Don · c146d7a3 · 5834a964 · 43c49d1e · c146d7a3
Commit 43c49d1e authored 3 years ago by Brutzman, Don
--- a/examples/WebsocketGateway/content/index.html
+++ b/examples/WebsocketGateway/content/index.html
@@ -27,13 +27,13 @@ to lat/lon/alt.
        <!-- Note: this is using a Google Maps API key linked to me, DMcG. For serious use, go to -->
        <!-- https://code.google.com/apis/console and get your own api key. Using this key is fine for demo purposes. -->
-        <script type="text/javascript" src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAZihiWY3ho8hHfkhu9_6mcMSkxSvpjbTI&amp;sensor=true"></script>
+        <script src="https://maps.googleapis.com/maps/api/js?key=AIzaSyAZihiWY3ho8hHfkhu9_6mcMSkxSvpjbTI&amp;sensor=true"></script>
        <!-- Binary DIS implementation, also coordinate system conversion utilities -->
-        <script type="text/javascript" src="scripts/dis.js"></script>
+        <script src="scripts/dis.js"></script>
-        <script type="text/javascript" src="scripts/DisAppearance.js"></script>
+        <script src="scripts/DisAppearance.js"></script>
-        <script type="text/javascript" src="scripts/app/index.js"></script>
+        <script src="scripts/app/index.js"></script>
    </head>
    <body>
        <div id="map-canvas"></div>

--- a/examples/WebsocketGateway/logs/jetty-2021_07_01.request.log
+++ b/examples/WebsocketGateway/logs/jetty-2021_07_01.request.log
--- a/examples/WebsocketGateway/nbproject/project.properties
+++ b/examples/WebsocketGateway/nbproject/project.properties
@@ -117,6 +117,7 @@ meta.inf.dir=${src.dir}/META-INF
 mkdist.disabled=false
 no.dependencies=true
 platform.active=default_platform
+project.license=MOVES
 run.classpath=\
    ${javac.classpath}:\
    ${build.classes.dir}:\

--- a/examples/src/OpenDis7Examples/ExampleSimulationProgram.java
+++ b/examples/src/OpenDis7Examples/ExampleSimulationProgram.java
@@ -97,7 +97,7 @@ public class ExampleSimulationProgram
            // Where is my entity?  Insert changes in position; this sample only changes X position.
            entityStatePdu_1.getEntityLocation().setX(entityStatePdu_1.getEntityLocation().getX() + 1.0); // 1m per timestep
-            // decide whether to fire, and then update the firePdu.  Hmmm, you might want a target to shoort at!
+            // decide whether to fire, and then update the firePdu.  Hmmm, you might want a target to shoot at!
            // etc. etc. your code goes here for your simulation of interest