Fix/heatmap message type change

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "jpo-utils"]
 	path = jpo-utils
-	url = https://github.com/usdot-jpo-ode/jpo-utils
+	url = https://github.com/CDOT-CV/jpo-utils
 	branch = master

.vscode/launch.json

@@ -35,7 +35,24 @@
       "stopOnEntry": false,
       "program": "${workspaceRoot}/services/api/src/main.py",
       "env": {
-        "FLASK_APP": "${workspaceRoot}/services/api/src/main.py"
+        "PYTHONPATH": "${workspaceRoot}/services",
+        "FLASK_APP": "${workspaceRoot}/services/api/src/main.py",
+        "FLASK_RUN_PORT": "8081",
+        "PG_DB_HOST": "localhost:5432",
+        "PG_DB_USER": "postgres",
+        "PG_DB_PASS": "postgres",
+        "PG_DB_NAME": "postgres",
+        "MONGO_DB_URI": "mongodb://ode:replace-me@localhost:27017/?directConnection=true&authSource=admin",
+        "MONGO_DB_NAME": "CV",
+        "MONGO_PROCESSED_BSM_COLLECTION_NAME": "processed_bsm",
+        "MONGO_PROCESSED_PSM_COLLECTION_NAME": "processed_psm",
+        "ENABLE_WZDX_FEATURES": "false",
+        "ENABLE_MOOVE_AI_FEATURES": "false",
+        "CORS_DOMAIN": "*",
+        "KEYCLOAK_ENDPOINT": "http://localhost:8084",
+        "KEYCLOAK_REALM": "cvmanager",
+        "KEYCLOAK_API_CLIENT_ID": "cvmanager-api",
+        "KEYCLOAK_API_CLIENT_SECRET_KEY": "keycloak-secret-key"
       },
       "args": ["run"],
       "envFile": "${workspaceRoot}/services/api/.env",
@@ -48,13 +65,13 @@
       "mainClass": "us.dot.its.jpo.ode.api.ConflictApiApplication",
       "projectName": "intersection-api",
       "envFile": "${workspaceFolder}/.env",
-      "preLaunchTask": "run-docker-compose-intersection-no-api"
+      "preLaunchTask": "run-intersection-no-api"
     }
   ],
   "compounds": [
     {
       "name": "Debug Solution",
-      "configurations": ["Python: Flask", "Launch web app with Intersection Data"]
+      "configurations": ["Python: Flask", "Launch web app with Intersection API"]
     }
   ]
 }

.vscode/settings.json

@@ -88,6 +88,7 @@
     "OIDC",
     "OIDCID",
     "pgdb",
+    "pgquery",
     "PGSQL",
     "postgis",
     "pythjon",

.vscode/tasks.json

@@ -15,44 +15,45 @@
       "command": "${command:python.interpreterPath} -m pytest -v --cov-report xml:cov.xml --cov ."
     },
     {
-      "label": "run-intersection",
+      "label": "run-keycloak-and-postgres",
       "type": "docker-compose",
       "dockerCompose": {
         "up": {
           "detached": true,
           "build": true,
-          "profiles": ["cvmanager_postgres", "cvmanager_keycloak", "intersection"]
+          "profiles": ["cvmanager_postgres", "cvmanager_keycloak"]
         },
         "files": ["${workspaceFolder}/docker-compose.yml"],
         "envFile": "${workspaceFolder}/.env"
-      },
-      "dependsOn": ["run-keycloak-and-postgres"]
+      }
     },
     {
-      "label": "run-docker-compose-intersection-no-api",
+      "label": "run-intersection",
       "type": "docker-compose",
       "dockerCompose": {
         "up": {
           "detached": true,
           "build": true,
-          "profiles": ["intersection_no_api", "cvmanager_api", "mongo_full", "kafka_full", "kafka_connect_standalone"]
+          "profiles": ["intersection", "mongo_full"]
         },
-        "files": ["${workspaceFolder}/docker-compose.yml", "${workspaceFolder}/docker-compose-intersection.yml"],
+        "files": ["${workspaceFolder}/docker-compose.yml"],
         "envFile": "${workspaceFolder}/.env"
-      }
+      },
+      "dependsOn": ["run-keycloak-and-postgres"]
     },
     {
-      "label": "run-keycloak-postgres-mongodb-kafka",
+      "label": "run-intersection-no-api",
       "type": "docker-compose",
       "dockerCompose": {
         "up": {
           "detached": true,
           "build": true,
-          "services": ["cvmanager_keycloak", "cvmanager_postgres"]
+          "profiles": ["mongo_full"]
         },
         "files": ["${workspaceFolder}/docker-compose.yml"],
         "envFile": "${workspaceFolder}/.env"
-      }
+      },
+      "dependsOn": ["run-keycloak-and-postgres"]
     },
     {
       "label": "run-full-conflictmonitor",
@@ -61,24 +62,12 @@
         "up": {
           "detached": true,
           "build": true,
-          "services": [
-            "cvmanager_postgres",
-            "cvmanager_keycloak",
-            "kafka",
-            "kafka_init",
-            "ode",
-            "geojsonconverter",
-            "conflictmonitor",
-            "deduplicator",
-            "conflictvisualizer_api",
-            "mongodb_container",
-            "connect"
-          ]
+          "services": ["kafka_full", "kafka_connect_standalone", "conflictmonitor"]
         },
-        "files": ["${workspaceFolder}/docker-compose-full-cm.yml"],
+        "files": ["${workspaceFolder}/docker-compose.yml"],
         "envFile": "${workspaceFolder}/.env"
       },
-      "dependsOn": ["run-keycloak-and-postgres"]
+      "dependsOn": ["run-intersection"]
     }
   ]
 }