GA initial data

client/package-lock.json

@@ -1,10 +1,11 @@
 {
-  "name": "client",
+  "name": "DCS Olympus",
   "version": "0.0.0",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
+      "name": "DCS Olympus",
       "version": "0.0.0",
       "dependencies": {
         "@types/geojson": "^7946.0.10",
@@ -19,6 +20,7 @@
         "save": "^2.9.0"
       },
       "devDependencies": {
+        "@types/gtag.js": "^0.0.12",
         "browserify": "^17.0.0",
         "concurrently": "^7.6.0",
         "tsify": "^5.0.4",
@@ -31,6 +33,12 @@
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
       "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="
     },
+    "node_modules/@types/gtag.js": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/@types/gtag.js/-/gtag.js-0.0.12.tgz",
+      "integrity": "sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg==",
+      "dev": true
+    },
     "node_modules/@types/leaflet": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.0.tgz",
@@ -3080,6 +3088,12 @@
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.10.tgz",
       "integrity": "sha512-Nmh0K3iWQJzniTuPRcJn5hxXkfB1T1pgB89SBig5PlJQU5yocazeu4jATJlaA0GYFKWMqDdvYemoSnF2pXgLVA=="
     },
+    "@types/gtag.js": {
+      "version": "0.0.12",
+      "resolved": "https://registry.npmjs.org/@types/gtag.js/-/gtag.js-0.0.12.tgz",
+      "integrity": "sha512-YQV9bUsemkzG81Ea295/nF/5GijnD2Af7QhEofh7xu+kvCN6RdodgNwwGWXB5GMI3NoyvQo0odNctoH/qLMIpg==",
+      "dev": true
+    },
     "@types/leaflet": {
       "version": "1.9.0",
       "resolved": "https://registry.npmjs.org/@types/leaflet/-/leaflet-1.9.0.tgz",
@@ -5544,4 +5558,4 @@
       "dev": true
     }
   }
-}
+}

client/package.json

@@ -22,10 +22,11 @@
     "save": "^2.9.0"
   },
   "devDependencies": {
+    "@types/gtag.js": "^0.0.12",
     "browserify": "^17.0.0",
     "concurrently": "^7.6.0",
     "tsify": "^5.0.4",
     "typescript": "^4.9.4",
     "watchify": "^4.0.0"
   }
-}
+}

client/src/index.ts

@@ -38,7 +38,7 @@ function setup() {
     selectionScroll = new SelectionScroll("selection-scroll");
     unitsManager = new UnitsManager();
     unitInfoPanel = new UnitInfoPanel("unit-info-panel");
-    scenarioDropdown = new Dropdown("scenario-dropdown", ["Caucasus", "Syria", "Marianas", "Nevada", "South Atlantic", "The channel"], () => { });
+    scenarioDropdown = new Dropdown("scenario-dropdown", ["Caucasus", "Marianas", "Nevada", "South Atlantic", "Syria", "The Channel"], () => { });
     mapSourceDropdown = new Dropdown("map-source-dropdown", map.getLayers(), (option: string) => map.setLayer(option));
     connectionStatusPanel = new ConnectionStatusPanel("connection-status-panel");
     missionData = new MissionData();
@@ -68,12 +68,23 @@ function setup() {
 
 function requestUpdate() {
     getDataFromDCS(update);
+    
     /* Main update rate = 250ms is minimum time, equal to server update time. */
     setTimeout(() => requestUpdate(), getConnected() ? 250 : 1000);
+
+    setInterval( () => {
+        /*
+        gtag( "event", "heartbeat", {
+
+        });
+        //*/
+    }, 60000);
+
     connectionStatusPanel.update(getConnected());
 }
 
 export function update(data: JSON) {
+    console.log( data );
     unitsManager.update(data);
     missionData.update(data);
 }

client/tsconfig.json

@@ -33,7 +33,8 @@
     ], /* Specify multiple folders that act like './node_modules/@types'. */
     "types": [
       "leaflet",
-      "geojson"
+      "geojson",
+      "@types/gtag.js"
     ], /* Specify type package names to be included without being referenced in a source file. */
     // "allowUmdGlobalAccess": true,                     /* Allow accessing UMD globals from modules. */
     // "moduleSuffixes": [],                             /* List of file name suffixes to search when resolving a module. */

client/views/index.ejs

@@ -7,6 +7,17 @@
   <link rel="preconnect" href="https://fonts.googleapis.com">
   <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>
   <link href="https://fonts.googleapis.com/css2?family=Open+Sans:wght@300;600&display=swap" rel="stylesheet"> 
+
+  <!-- Google tag (gtag.js) -->
+<script async src="https://www.googletagmanager.com/gtag/js?id=G-Z4L2TC3YX0"></script>
+<script>
+  window.dataLayer = window.dataLayer || [];
+  function gtag(){dataLayer.push(arguments);}
+  gtag('js', new Date());
+
+  gtag('config', 'G-Z4L2TC3YX0');
+</script>
+
 </head>
 
 <body>

scripts/OlympusMission.lua

@@ -55,9 +55,11 @@ function Olympus.setMissionData(arg, time)
 		basesData[i] = info
 	end
 
+	
+
 	-- Assemble missionData table
 	missionData["bullseye"] = bullseye
-	missionData["unitsData"] = unitsData 
+	missionData["unitsData"] = unitsData
 	missionData["airbases"] = basesData
 
 	local command = "Olympus.missionData = " .. Olympus.serializeTable(missionData) .. "\n" .. "Olympus.OlympusDLL.setMissionData()"