From 44b487c7152c8d86a25afae3ea9cd12999d72471 Mon Sep 17 00:00:00 2001
From: Aaron Brethorst <aaron@brethorsting.com>
Date: Wed, 18 Sep 2024 21:33:31 -0700
Subject: [PATCH] Fixes Google Maps configuration in oba-enterprise-acta-webapp

---
 oba/bootstrap.sh                      | 6 +++---
 oba/config/googlemaps.config.json.hbs | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/oba/bootstrap.sh b/oba/bootstrap.sh
index 16ee1ba..47cc660 100644
--- a/oba/bootstrap.sh
+++ b/oba/bootstrap.sh
@@ -66,8 +66,6 @@ hbs_renderer -input "$FEDERATION_XML_SOURCE" \
 WEBAPP_XML_SOURCE="/oba/config/onebusaway-enterprise-acta-webapp-data-sources.xml.hbs"
 WEBAPP_XML_DESTINATION="$CATALINA_HOME/webapps/ROOT/WEB-INF/classes/data-sources.xml"
 
-mkdir -p $(dirname "$MAP_CONFIG_FILE")
-
 if [ -z "$GOOGLE_MAPS_API_KEY" ] && [ -z "$GOOGLE_MAPS_CLIENT_ID" ] && [ -z "$GOOGLE_MAPS_CHANNEL_ID" ]; then
     echo "No Google Maps related environment variables are set. Removing element from data-sources.xml"
     GOOGLE_MAPS_CONFIGURED=""
@@ -78,8 +76,10 @@ else
     MAP_CONFIG_SOURCE="/oba/config/googlemaps.config.json.hbs"
     MAP_CONFIG_DESTINATION="/var/lib/oba/config.json"
 
+    mkdir -p $(dirname "$MAP_CONFIG_DESTINATION")
+
     hbs_renderer -input "$MAP_CONFIG_SOURCE" \
-                 -json '{"GOOGLE_MAPS_API_KEY": "'$GOOGLE_MAPS_API_KEY'", "GOOGLE_MAPS_CLIENT_ID": "'$GOOGLE_MAPS_CLIENT_ID'", "GOOGLE_MAPS_CHANNEL_ID": "'$GOOGLE_MAPS_CHANNEL_ID'"}' \
+                 -json '{"GOOGLE_MAPS_CONFIGURED": "'$GOOGLE_MAPS_CONFIGURED'", "GOOGLE_MAPS_API_KEY": "'$GOOGLE_MAPS_API_KEY'", "GOOGLE_MAPS_CLIENT_ID": "'$GOOGLE_MAPS_CLIENT_ID'", "GOOGLE_MAPS_CHANNEL_ID": "'$GOOGLE_MAPS_CHANNEL_ID'"}' \
                  -output "$MAP_CONFIG_DESTINATION"
 fi
 
diff --git a/oba/config/googlemaps.config.json.hbs b/oba/config/googlemaps.config.json.hbs
index 74a318a..0b3e594 100644
--- a/oba/config/googlemaps.config.json.hbs
+++ b/oba/config/googlemaps.config.json.hbs
@@ -1,9 +1,9 @@
 {
     "config":[
         {{#if GOOGLE_MAPS_CONFIGURED}}
-        [{"component": "display", "key": "display.googleMapsApiKey", "value": "{{GOOGLE_MAPS_API_KEY}}"}],
-        [{"component": "display", "key": "display.googleMapsClientId", "value": "{{GOOGLE_MAPS_CLIENT_ID}}"}],
-        [{"component": "display", "key": "display.googleMapsChannelId", "value": "{{GOOGLE_MAPS_CHANNEL_ID}}"}]
+        {"component": "display", "key": "display.googleMapsApiKey", "value": "{{GOOGLE_MAPS_API_KEY}}"},
+        {"component": "display", "key": "display.googleMapsClientId", "value": "{{GOOGLE_MAPS_CLIENT_ID}}"},
+        {"component": "display", "key": "display.googleMapsChannelId", "value": "{{GOOGLE_MAPS_CHANNEL_ID}}"}
         {{/if}}
     ]
 }
\ No newline at end of file