Merge pull request #44 from AndreHauschild/devel

Improve ANTEX file selection for CODE and HAS products

Author: hirokawa

README.md

@@ -10,13 +10,7 @@ Pre-installation of **CSSRlib** is required. Install the [officially released pa
 pip install cssrlib
 ```
 
-Additional python packages are required as prerequisites and can be installed via the following command
-
-```bash
-pip install -r requirements.txt
-```
-
-It is recommended to use a virtual environment to avoid version conflicts with the system-wide python installation.
+It is recommended to use a virtual environment to avoid version conflicts of required modules with the system-wide python installation.
 
 ## Installation in Virtual Environment
 

data/README-DATA.md

@@ -1,7 +1,15 @@
+# Example data for CSSRLIB
 
-Example data for CSSRLIB
+## Download of IGS data
 
-# QZSS CLAS and SLAS
+Most sample scripts require IGS data for processing. The data can be downloaded with a script, which must be called before the scripts can be executed:
+
+```bash
+cd ../data/samples
+python3 igs_download.py
+```
+
+## QZSS CLAS and SLAS
 
 The correction data for CLAS and SLAS is downloaded from QZS Web site (https://qzss.go.jp/en/).
 Please check the following license term for these data set.
@@ -12,12 +20,11 @@ https://sys.qzss.go.jp/dod/en/archives/agree.html?SERVICE_ID=CLAS
 [correction data for SLAS]
 https://sys.qzss.go.jp/dod/en/archives/agree.html?SERVICE_ID=SLAS
 
-# Galileo HAS
+## Galileo HAS
 
-The files for the Galileo-HAS test script Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example.txt and Galileo-HAS-SIS-ICD_1.0_Annex_B_Reed_Solomon_Generator_Matrix.txt are embedded as appendix in the Galileo HAS-ICD.
+The files for the Galileo-HAS test script `Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example.txt` and `Galileo-HAS-SIS-ICD_1.0_Annex_B_Reed_Solomon_Generator_Matrix.txt` are embedded as appendix in the Galileo HAS-ICD. The file with the HAS message decoding example in Annex D contains non-UTF-8 characters. These must be removed with:
 
-The file with the HAS message decoding example in Annex D contains non-UTF-8 characters. These must be removed with
-
-```
-iconv -f utf-8 -t utf-8 -c Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example.txt > Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example.fixed.txt
+```bash
+mv Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example.txt Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example_orig.txt
+iconv -f utf-8 -t utf-8 -c Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example_orig.txt > Galileo-HAS-SIS-ICD-1.0_Annex_D_HAS_Message_Decoding_Example.txt
 ```

data/igs_files.txt

@@ -1,6 +1,9 @@
 antex https://files.igs.org/pub/station/general/igs20.atx
 antex https://files.igs.org/pub/station/general/igs14.atx
 
+antex https://files.igs.org/pub/station/general/pcv_archive/igs20_2353.atx
+antex https://www.gsc-europa.eu/sites/default/files/sites/all/files/has14_2345.atx
+
 antex http://ftp.aiub.unibe.ch/CODE_MGEX/CODE/I20.ATX
 antex http://ftp.aiub.unibe.ch/CODE_MGEX/CODE/M20.ATX
 antex http://ftp.aiub.unibe.ch/CODE_MGEX/CODE/M14.ATX
@@ -13,9 +16,9 @@ brdc  ftp://gdc.cddis.eosdis.nasa.gov/pub/gnss/data/daily/2023/brdc/BRD400DLR_S_
 brdc  ftp://gdc.cddis.eosdis.nasa.gov/pub/gnss/data/daily/2023/brdc/BRD400DLR_S_20232230000_01D_MN.rnx.gz
 brdc  ftp://gdc.cddis.eosdis.nasa.gov/pub/gnss/data/daily/2023/brdc/BRD400DLR_S_20231890000_01D_MN.rnx.gz
 
-igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2353/COD0MGXFIN_20250460000_01D_05M_ORB.SP3.gz
-igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2353/COD0MGXFIN_20250460000_01D_30S_CLK.CLK.gz
-igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2353/COD0MGXFIN_20250460000_01D_01D_OSB.BIA.gz
+igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2353/COD0OPSFIN_20250460000_01D_05M_ORB.SP3.gz
+igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2353/COD0OPSFIN_20250460000_01D_30S_CLK.CLK.gz
+igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2353/COD0OPSFIN_20250460000_01D_01D_OSB.BIA.gz
 
 igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2274/COD0MGXFIN_20232230000_01D_01D_OSB.BIA.gz
 igs   ftp://gdc.cddis.eosdis.nasa.gov/pub/gps/products/2274/COD0MGXFIN_20232230000_01D_05M_ORB.SP3.gz

receiver/decode_jps.py

@@ -912,8 +912,6 @@ def decode(self, buff, len_, sys=[], prn=[]):
             print("[{:s}] undef".format(head))
         return 0
 
-
-
 def decode(f, opt, args):
 
     print("Decoding {}".format(f))
@@ -961,17 +959,18 @@ def main():
 
     # Input file and folder
     #
-    parser.add_argument("inpFileName",  help="Input JPS file(s) (wildcards allowed)")
+    parser.add_argument("inpFileName",
+                        help="Input JPS file(s) (wildcards allowed)")
 
     parser.add_argument("--receiver", default='unknown',
                         help="Receiver type [unknown]")
     parser.add_argument("--antenna", default='unknown',
                         help="Antenna type [unknown]")
 
-    parser.add_argument("-g","--gnss",default='GRECIJ',
+    parser.add_argument("-g", "--gnss", default='GRECIJ',
                         help="GNSS [GRECIJ]")
 
-    parser.add_argument("-j","--jobs",default=int(mp.cpu_count() / 2),
+    parser.add_argument("-j", "--jobs", default=int(mp.cpu_count() / 2),
                         type=int, help='Max. number of parallel processes')
 
     # Retrieve all command line arguments
@@ -989,10 +988,10 @@ def main():
 
     opt.flg_qzsl6 = True
 
-    opt.flg_bdsb1c = True
+    opt.flg_bdsb1c = False
     opt.flg_bdsb2b = True
 
-    opt.flg_sbas = False
+    opt.flg_sbas = True
 
     opt.flg_gpslnav = True
 

samples/igs_download.py

@@ -136,7 +136,13 @@ def write_chunk(data):
 def download_http(url, filename, local_filename):
     """Download a file via HTTP/HTTPS."""
     try:
-        response = requests.get(url, stream=True)
+        # Set a user-agent to avoid blocking by some servers
+        if 'www.gsc-europa.eu' in url:
+            headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 '
+                       '(KHTML, like Gecko) Chrome/120.0.0.0 Safari/537.36'}
+            response = requests.get(url, stream=True, headers=headers)
+        else:
+            response = requests.get(url, stream=True)
         response.raise_for_status()  # Raise an error for bad status codes
 
         total_size = int(response.headers.get('content-length', 0))