Merge pull request #101 from sdr-enthusiasts/main

Bring dev up to date with main

.github/workflows/on_pr.yml

@@ -67,7 +67,7 @@ jobs:
       # List of files to check to trigger a rebuild on this job
       - name: Get specific changed files
         id: changed-files-specific
-        uses: tj-actions/changed-files@v42.0.2
+        uses: tj-actions/changed-files@v42.0.4
         with:
           files: |
             Dockerfile

README.md

@@ -30,7 +30,7 @@ services:
         - VRS_DB_UPDATE_WITH_VACUUM=yes #default unset / no
         - VRS_DB_UPDATE_BACKUP_UNCOMPRESSED=yes #default unset / compressed
         - VRS_ENHANCED_MARKERS=normal #default unset
-        - VRS_ENHANCED_LAYERS_COUNTRY=UK #Currently available: UK,DE,USA1,USAAZ,SE,AU
+        - VRS_ENHANCED_LAYERS_COUNTRY=UK #Currently available: UK,DE,USA1,USAAZ,SE,AU,IN,ID,NL,FR,ES
         - 'VRS_ENHANCED_LAYERS_CONFIG={
 
             /* Map Options */
@@ -58,6 +58,8 @@ services:
         - VRS_SBSPORT=30003
         - VRS_ENHANCED_LAYERS_OPENWX_APIKEY=yourapikey
         - VRS_ENHANCED_LAYERS_OPENAIP_APIKEY=yourapikey
+        - VRS_ENHANCED_LAYERS_STADIA_APIKEY=yourapikey
+        - VRS_ENHANCED_LAYERS_THUNDERFOREST_APIKEY=yourapikey
         - VRS_SILHOUETTES_DUALVIEW=true
     tmpfs:
       - /tmp:rw,nosuid,nodev,noexec,relatime,size=128M
@@ -110,9 +112,11 @@ The container image comes with the following preinstalled VRS V3 [plugins](https
 | `VRS_DB_UPDATE_BACKUP_UNCOMPRESSED` | Works only in conjunction with `VRS_DB_UPDATE_POLICY_FULLAUTO`. Prior the update a backup of the database is created. If this is set, the backup will remain uncompressed | `unset` |
 | `VRS_CULTURE` | see [here](http://msdn.microsoft.com/en-us/goglobal/bb896001.aspx) for a list of supported culture names. Not all translations may be available | `unset` means `en-GB` |
 | `VRS_ENHANCED_MARKERS` | Installs and activates VRS custom markers. `normal` is for the ADS-B set, `hfdl` is for an extra set in case you have a HFDL input and `disable` deactivates the markers. [here](https://github.com/rikgale/VRSCustomMarkers) are more details about the markers. | `unset` |
-| `VRS_ENHANCED_LAYERS_COUNTRY` | Installs and activates VRS enhanced layers. Takes a country code as input. Currently availble are `UK`, `DE`, `USA1`, `USAAZ`, `SE`,`AU`. [here](https://github.com/rikgale/VRSCustomLayers) are more details, feel free to open an issue there to get your country on board. | `unset` - Unknown country codes will default to UK |
+| `VRS_ENHANCED_LAYERS_COUNTRY` | Installs and activates VRS enhanced layers. Takes a country code as input. Currently availble are `UK`, `DE`, `USA1`, `USAAZ`, `SE`,`AU`,`IN`,`ID`,`NL`,`FR`,`ES`. [here](https://github.com/rikgale/VRSCustomLayers) are more details, feel free to open an issue there to get your country on board. | `unset` - Unknown country codes will default to UK |
 | `VRS_ENHANCED_LAYERS_OPENWX_APIKEY` | For the enhanced weather layers to work, you need an API key. Again,  [here](https://github.com/rikgale/VRSCustomLayers) are more details, and instructions how to obtain an API key. | `unset` |
 | `VRS_ENHANCED_LAYERS_OPENAIP_APIKEY` | For the OpenAIP layers to work, you need an API key. Again,  [here](https://github.com/rikgale/VRSCustomLayers) are more details, and instructions how to obtain an API key. | `unset` |
+| `VRS_ENHANCED_LAYERS_STADIA_APIKEY` | For the [Stadia map](https://docs.stadiamaps.com) to work, you need an API key. Again,  [here](https://github.com/rikgale/VRSCustomLayers) are more details, and instructions how to obtain an API key. | `unset` |
+| `VRS_ENHANCED_LAYERS_THUNDERFOREST_APIKEY` | For the [Thunderforest map](https://www.thunderforest.com) to work, you need an API key. Again,  [here](https://github.com/rikgale/VRSCustomLayers) are more details, and instructions how to obtain an API key. | `unset` |
 | `VRS_SILHOUETTES_DUALVIEW` | If set, then the "Dual View Silhouettes" will be used. The set of DV Silhouettes might be incomplete. | `unset` |
 | `VRS_SBSHOST` | IP or hostname of a BaseStation ADS-B data feed provider. In general it's more easy to set up the receivers on the WebAdmin panel | `unset` defaults to `readsb` |
 | `VRS_SBSPORT` | Port the BaseStation ADS-B data feed provider | `unset` defaults to `30003` |

rootfs/etc/s6-overlay/scripts/61-layer

@@ -96,6 +96,30 @@ if [[ -n "${VRS_ENHANCED_LAYERS_COUNTRY}" ]]
                     echo "[$APPNAME][$(date)] Enhanced Layers API Keys config injection - Failure"
                 fi
             fi
+              if [[ -n "${VRS_ENHANCED_LAYERS_STADIA_APIKEY}" ]]
+                then
+                  echo "[$APPNAME][$(date)] Found Stadia APIkey - injecting"
+                   if sed -i -e "s/##STADIAKEY##/${VRS_ENHANCED_LAYERS_STADIA_APIKEY}/g" ${VRS_EXTENSION_DIR}/EndOfBody.html
+                     then
+                       echo "[$APPNAME][$(date)] Injecting Stadia APIkey - OK"
+                     else
+                       echo "[$APPNAME][$(date)] Injecting Stadia APIkey - Fail"
+                     fi
+                  else
+                    echo "[$APPNAME][$(date)] Stadia APIkey not set in yaml"
+              fi
+              if [[ -n "${VRS_ENHANCED_LAYERS_THUNDERFOREST_APIKEY}" ]]
+                then
+                  echo "[$APPNAME][$(date)] Found Thunderforest APIkey - injecting"
+                   if sed -i -e "s/##THUNDERFORESTKEY##/${VRS_ENHANCED_LAYERS_THUNDERFOREST_APIKEY}/g" ${VRS_EXTENSION_DIR}/EndOfBody.html
+                     then
+                       echo "[$APPNAME][$(date)] Injecting Thunderforest APIkey - OK"
+                     else
+                       echo "[$APPNAME][$(date)] Injecting Thunderforest APIkey - Fail"
+                     fi
+                  else
+                    echo "[$APPNAME][$(date)] Thunderforest APIkey not set in yaml"
+              fi
             if [[ -n "${VRS_ENHANCED_LAYERS_CONFIG}" ]]
               then
                 #shellcheck disable=SC2001