diff --git a/iturhfprop-service/Dockerfile b/iturhfprop-service/Dockerfile index 5fd64e9..0952447 100644 --- a/iturhfprop-service/Dockerfile +++ b/iturhfprop-service/Dockerfile @@ -56,18 +56,6 @@ RUN mkdir -p /opt/iturhfprop/Data \ # Cleanup RUN rm -rf ITU-R-HF-14.3 source.tar.gz -# Create Isotropic antenna file (Type 13 format) -# Format: Name, Type, Frequency(MHz), then elevation/gain pairs -RUN printf 'Isotropic\n' > /opt/iturhfprop/Data/Isotropic.ant \ - && printf '13\n' >> /opt/iturhfprop/Data/Isotropic.ant \ - && printf '14.0\n' >> /opt/iturhfprop/Data/Isotropic.ant \ - && printf '37\n' >> /opt/iturhfprop/Data/Isotropic.ant \ - && for i in $(seq 0 5 180); do printf '%d 0.0\n' $i >> /opt/iturhfprop/Data/Isotropic.ant; done \ - && echo "=== Created Isotropic.ant ===" \ - && cat /opt/iturhfprop/Data/Isotropic.ant \ - && echo "=== Final file count ===" \ - && ls /opt/iturhfprop/Data/ | wc -l - # Set library path so ITURHFProp can find shared libs ENV LD_LIBRARY_PATH=/opt/iturhfprop:$LD_LIBRARY_PATH diff --git a/iturhfprop-service/server.js b/iturhfprop-service/server.js index 01dd495..66e0026 100644 --- a/iturhfprop-service/server.js +++ b/iturhfprop-service/server.js @@ -77,7 +77,7 @@ function generateInputFile(params) { // Format frequencies const freqList = frequencies.map(f => f.toFixed(3)).join(' '); - // ITURHFProp input file format + // ITURHFProp input file format - complete version const input = `PathName "OpenHamClock" Path.L_tx.lat ${txLat.toFixed(4)} Path.L_tx.lng ${txLon.toFixed(4)} @@ -95,8 +95,8 @@ Path.Relr ${requiredReliability} Path.ManMadeNoise ${manMadeNoise} Path.Modulation ANALOG Path.SorL SHORTPATH -TXAntFilePath "${ITURHFPROP_DATA}/Data/Isotropic.ant" -RXAntFilePath "${ITURHFPROP_DATA}/Data/Isotropic.ant" +TXAntFilePath "ISOTROPIC" +RXAntFilePath "ISOTROPIC" DataFilePath "${ITURHFPROP_DATA}/Data/" `; @@ -370,8 +370,8 @@ app.get('/api/diag', async (req, res) => { Path.L_tx.lng -75.0 Path.L_rx.lat 51.0 Path.L_rx.lng 0.0 -Path.year 2026 -Path.month 2 +Path.year 2025 +Path.month 6 Path.hour 12 Path.SSN 100 Path.frequency 14.0 @@ -382,8 +382,8 @@ Path.Relr 90 Path.ManMadeNoise RESIDENTIAL Path.Modulation ANALOG Path.SorL SHORTPATH -TXAntFilePath "${ITURHFPROP_DATA}/Data/Isotropic.ant" -RXAntFilePath "${ITURHFPROP_DATA}/Data/Isotropic.ant" +TXAntFilePath "ISOTROPIC" +RXAntFilePath "ISOTROPIC" DataFilePath "${ITURHFPROP_DATA}/Data/" `; fs.writeFileSync('/tmp/test_input.txt', testInput);