Release v4.6.3: Enhance SunAndMoon datasource with user-editable location and confirm coordinates during setup #589

Author: jasonacox

RELEASE.md

@@ -1,5 +1,10 @@
 # RELEASE NOTES
 
+## v4.6.3 - SunAndMoon Edit
+
+* Update SunAndMoon datasource auto-provisioning to allow user to edit location.
+* Add location LAT and LONG confirmation as part of setup.sh script.
+
 ## v4.6.2 - Normalize Alerts
 
 Updates to pyPowerwall v0.12.7 which includes:

VERSION

@@ -1 +1 @@
-4.6.2
+4.6.3

grafana/sunandmoon-template.yml

@@ -6,3 +6,4 @@ datasources:
     jsonData: 
       latitude: zzLAT 
       longitude: zzLONG
+    editable: true

setup.sh

@@ -80,16 +80,6 @@ running() {
     [[ $status == ${code} ]]
 }
 
-# Get latitude and longitude 
-LAT="0.0"
-LONG="0.0"
-PYTHON=$(command -v python3 || command -v python)
-if [ -n "${PYTHON}" ]; then
-    IP_RESPONSE=$(curl -s https://freeipapi.com/api/json)
-    LAT=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['latitude'])")
-    LONG=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['longitude'])")
-fi
-
 # Docker Dependency Check
 if ! docker info > /dev/null 2>&1; then
     echo "ERROR: docker is not available or not running."
@@ -442,9 +432,37 @@ fi
 echo "-----------------------------------------"
 echo ""
 
+# Get latitude and longitude 
+LAT="0.0"
+LONG="0.0"
+PYTHON=$(command -v python3 || command -v python)
+if [ -n "${PYTHON}" ]; then
+    IP_RESPONSE=$(curl -s https://freeipapi.com/api/json)
+    LAT=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['latitude'])")
+    LONG=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['longitude'])")
+fi
+# check to see if LAT and LONG are not 0.0
+echo "Using your location coordinates to determine sun cycle."
+if [ "${LAT}" == "0.0" ] || [ "${LONG}" == "0.0" ]; then
+    echo "   Your current location could not be automatically determined."
+    echo "   For help go to https://jasonacox.github.io/Powerwall-Dashboard/location.html"
+else
+    echo "   Your current location appears to be Latitude: ${LAT}, Longitude: ${LONG}"
+fi
+echo ""
+read -p 'Enter Latitude (default: '${LAT}'): ' USER_LAT
+if [ -n "${USER_LAT}" ]; then
+    LAT="${USER_LAT}"
+fi
+read -p 'Enter Longitude (default '${LONG}'): ' USER_LONG
+if [ -n "${USER_LONG}" ]; then
+    LONG="${USER_LONG}"
+fi
+echo ""
+
 # Optional - Setup Weather Data
 if [ -f weather.sh ]; then
-    ./weather.sh setup
+    ./weather.sh setup "${LAT}" "${LONG}"
 fi
 
 if [ -f grafana/sunandmoon-template.yml ]; then

upgrade.sh

@@ -6,7 +6,7 @@
 set -e
 
 # Set Globals
-VERSION="4.6.2"
+VERSION="4.6.3"
 CURRENT="Unknown"
 COMPOSE_ENV_FILE="compose.env"
 INFLUXDB_ENV_FILE="influxdb.env"

weather.sh

@@ -21,14 +21,21 @@ fi
 
 # Docker Dependency Check - moved to compose-dash.sh, 14/10/22
 
-# Get latitude and longitude 
+# Set latitude and longitude
 LAT="0.0"
 LONG="0.0"
-PYTHON=$(command -v python3 || command -v python)
-if [ -n "${PYTHON}" ]; then
-    IP_RESPONSE=$(curl -s https://freeipapi.com/api/json)
-    LAT=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['latitude'])")
-    LONG=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['longitude'])")
+# Check for LAT and LONG on command line
+if [ "${1}" == "setup" ] && [ -n "${2}" ] && [ -n "${3}" ]; then
+    LAT="${2}"
+    LONG="${3}"
+else
+    # Try to detect location
+    PYTHON=$(command -v python3 || command -v python)
+    if [ -n "${PYTHON}" ]; then
+        IP_RESPONSE=$(curl -s https://freeipapi.com/api/json)
+        LAT=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['latitude'])")
+        LONG=$(echo "$IP_RESPONSE" | "${PYTHON}" -c "import sys, json; print(json.load(sys.stdin)['longitude'])")
+    fi
 fi
 
 # Setup Weather?