Changeset 9404 in ntrip for trunk/BNC/src


Ignore:
Timestamp:
Apr 14, 2021, 2:51:04 PM (3 years ago)
Author:
stoecker
Message:

drop the deprecated www prefix

Location:
trunk/BNC/src
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/BNC/src/bnchelp.html

    r9385 r9404  
    341341  for data coming from Ntrip Broadcasters like
    342342<ul>
    343   <li><a href="http://www.euref-ip.net/home" target="_blank">http://www.euref-ip.net/home</a></li>
    344   <li><a href="http://www.igs-ip.net/home" target="_blank">http://www.igs-ip.net/home</a></li>
     343  <li><a href="http://euref-ip.net/home" target="_blank">http://euref-ip.net/home</a></li>
     344  <li><a href="http://igs-ip.net/home" target="_blank">http://igs-ip.net/home</a></li>
    345345  <li><a href="http://products.igs-ip.net/home" target="_blank">http://products.igs-ip.net/home</a></li>
    346346  <li><a href="http://mgex.igs-ip.net/home" target="_blank">http://mgex.igs-ip.net/home</a></li>
    … …  
    11901190<li>
    11911191EUREF as well as IGS adhere to an open data policy. Streams are made available through Ntrip Broadcasters at
    1192 <a href="http://www.euref-ip.net/home" target="_blank">http://www.euref-ip.net/home</a>,
    1193  <a href="http://www.igs-ip.net/home" target="_blank">http://www.igs-ip.net/home</a>,
     1192<a href="http://euref-ip.net/home" target="_blank">http://euref-ip.net/home</a>,
     1193 <a href="http://igs-ip.net/home" target="_blank">http://igs-ip.net/home</a>,
    11941194 <a href="http://products.igs-ip.net/home" target="_blank">http://products.igs-ip.net/home</a> and
    11951195 <a href="http://mgex.igs-ip.net/home" target="_blank">http://mgex.igs-ip.net/home</a>
    … …  
    14721472</pre>
    14731473<p>
    1474 If several streams show up with exactly the same mountpoint name (example: BRUS0 from <u>www.euref-ip.net</u> and BRUS0 from <u>www.igs-ip.net</u>), BNC adds an integer number to the filename, leading e.g. to hourly RINEX Version 2 Observation files like</p>
     1474If several streams show up with exactly the same mountpoint name (example: BRUS0 from <u>euref-ip.net</u> and BRUS0 from <u>igs-ip.net</u>), BNC adds an integer number to the filename, leading e.g. to hourly RINEX Version 2 Observation files like</p>
    14751475<pre>
    14761476   BRUS{ddd}{h}_0.{yy}O
    … …  
    45454545<p><h4 id="streamhost">2.19.1.1.1 Caster Host and Port - mandatory</h4></p>
    45464546<p>
    4547 Enter the Ntrip Broadcaster host IP and port number. Note that EUREF and IGS operate Ntrip Broadcasters at <u>http://www.euref-ip.net/home</u>, <u>http://www.igs-ip.net/home</u>, <u>http://products.igs-ip.net/home</u> and <u>http://mgex.igs-ip.net/home</u>.
     4547Enter the Ntrip Broadcaster host IP and port number. Note that EUREF and IGS operate Ntrip Broadcasters at <u>http://euref-ip.net/home</u>, <u>http://igs-ip.net/home</u>, <u>http://products.igs-ip.net/home</u> and <u>http://mgex.igs-ip.net/home</u>.
    45484548</p>
    45494549
    45504550<p><h4 id="streamtable">2.19.1.1.2 Casters Table - optional</h4></p>
    45514551<p>
    4552 It may be that you are not sure about your Ntrip Broadcaster's host and port number or you are interested in other broadcaster installations operated elsewhere. Hit 'Show' for a table of known broadcasters maintained at <u>www.rtcm-ntrip.org/home</u>. A window opens which allows selecting a broadcaster for stream retrieval, see figure below.
     4552It may be that you are not sure about your Ntrip Broadcaster's host and port number or you are interested in other broadcaster installations operated elsewhere. Hit 'Show' for a table of known broadcasters maintained at <u>rtcm-ntrip.org/home</u>. A window opens which allows selecting a broadcaster for stream retrieval, see figure below.
    45534553</p>
    45544554
    … …  
    52625262<b>Upload Corrections Panel keys:</b>
    52635263   uploadMountpointsOut   {Upload corrections table [character string, semicolon separated list, each element in quotation marks, example:
    5264                           "www.igs-ip.net,2101,IGS01,pass,IGS14,0,/home/user/BNC$[GPSWD}.sp3,/home/user/BNC$[GPSWD}.clk,258,1,0;
    5265                            www.euref-ip.net,2101,EUREF01,pass,ETRF2000,0,,,258,2,0"]}
     5264                          "igs-ip.net,2101,IGS01,pass,IGS14,0,/home/user/BNC$[GPSWD}.sp3,/home/user/BNC$[GPSWD}.clk,258,1,0;
     5265                           euref-ip.net,2101,EUREF01,pass,ETRF2000,0,,,258,2,0"]}
    52665266   uploadIntr             {Length of SP3 and Clock RINEX file interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}
    52675267   uploadSamplRtcmEphCorr {Orbit corrections stream sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}
    … …  
    52955295<b>Add Stream keys:</b>
    52965296   mountPoints   {Mountpoints [character string, semicolon separated list, example:
    5297                  "//user:pass@www.igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2;
    5298                  //user:pass@www.igs-ip.net:2101/FFMJ2 RTCM_3.1 DEU 50.09 8.66 no 2"}
     5297                 "//user:pass@igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2;
     5298                 //user:pass@igs-ip.net:2101/FFMJ2 RTCM_3.1 DEU 50.09 8.66 no 2"}
    52995299   ntripVersion  {Ntrip Version [character string: 1|2|2s|R|U]}
    53005300   casterUrlList {Visited Broadcasters [character string, comma separated list]}
    … …  
    53195319        --key reqcRnxVersion 2 --key reqcSampling 30 --key reqcV2Priority CWPX_?
    53205320(6) bnc --key mountPoints "//user:pass@mgex.igs-ip.net:2101/CUT07 RTCM_3.0 ETH 9.03 38.74 no 2;
    5321                            //user:pass@www.igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2"
     5321                           //user:pass@igs-ip.net:2101/FFMJ1 RTCM_3.1 DEU 50.09 8.66 no 2"
    53225322(7) bnc --key cmbStreams "CLK11 BLG 1.0;CLK93 CNES 1.0"
    53235323(8) bnc --key uploadMountpointsOut "products.igs-ip.net,98756,TEST,letmein,IGS14,2,/Users/weber/BNC${GPSWD}.clk,,33,3,2;
    5324                                     www.euref-ip.net,333,TEST2,aaaaa,NAD83,2,,,33,5,5"
     5324                                    euref-ip.net,333,TEST2,aaaaa,NAD83,2,,,33,5,5"
    53255325(9) bnc --key PPP/staTable "FFMJ1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;
    53265326                            CUT07,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778"
    … …  
    53345334  <tr><td>Distribution of IGS-IP streams &nbsp;</td><td><a href="http://www.igs.oma.be/real_time/" target="_blank">http://www.igs.oma.be/real_time/</a></td></tr>
    53355335  <tr><td>Completeness and latency of IGS-IP data &nbsp;</td><td><a href="http://www.igs.oma.be/highrate/" target="_blank">http://www.igs.oma.be/highrate/</a></td></tr>
    5336   <tr><td>Ntrip Broadcaster overview &nbsp;</td><td><a href="http://www.rtcm-ntrip.org/home" target="_blank">http://www.rtcm-ntrip.org/home</a></td></tr>
     5336  <tr><td>Ntrip Broadcaster overview &nbsp;</td><td><a href="http://rtcm-ntrip.org/home" target="_blank">http://rtcm-ntrip.org/home</a></td></tr>
    53375337  <tr><td>Ntrip Open Source software code &nbsp;</td><td><a href="http://software.rtcm-ntrip.org" target="_blank">http://software.rtcm-ntrip.org</a></td></tr>
    53385338  <tr><td>EUREF-IP Project &nbsp;</td><td><a href="http://www.epncb.oma.be/euref_IP" target="_blank">http://www.epncb.oma.be/euref_IP</a></td></tr>

  • trunk/BNC/src/bncmain.cpp

    r9302 r9404  
    267267      "Upload Corrections Panel keys:\n"
    268268      "   uploadMountpointsOut   {Upload corrections table [character string, semicolon separated list, each element in quotation marks, example:\n"
    269       "                          \"www.igs-ip.net,2101,IGS01,pass,IGS14,0,/home/user/BNC$[GPSWD}.sp3,/home/user/BNC$[GPSWD}.clk,258,1,0;\n"
    270       "                          www.euref-ip.net,2101,EUREF01,pass,ETRF2000,0,,,258,2,0\"]}\n"
     269      "                          \"igs-ip.net,2101,IGS01,pass,IGS14,0,/home/user/BNC$[GPSWD}.sp3,/home/user/BNC$[GPSWD}.clk,258,1,0;\n"
     270      "                          euref-ip.net,2101,EUREF01,pass,ETRF2000,0,,,258,2,0\"]}\n"
    271271      "   uploadIntr             {Length of SP3 and Clock RINEX file interval [character string: 1 min|2 min|5 min|10 min|15 min|30 min|1 hour|1 day]}\n"
    272272      "   uploadSamplRtcmEphCorr {Orbit corrections stream sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
    … …  
    293293      "Upload Ephemeris Panel keys:\n"
    294294      "   uploadEphMountpointsOut {Upload corrections table [character string, semicolon separated list, each element in quotation marks, example:\n"
    295       "                           \"www.igs-ip.net,2101,RTCM3EPH_GPS,pass,GPS\"]}\n"
     295      "                           \"igs-ip.net,2101,RTCM3EPH_GPS,pass,GPS\"]}\n"
    296296      "   uploadSamplRtcmEph      {Stream upload sampling rate [integer number of seconds: 0|5|10|15|20|25|30|35|40|45|50|55|60]}\n"
    297297      "\n"
    298298      "Add Stream keys:\n"
    299299      "   mountPoints   {Mountpoints [character string, semicolon separated list, example:\n"
    300       "                 \"//user:pass@www.igs-ip.net:2101/FFMJ00DEU1 RTCM_3.1 DEU 50.09 8.66 no 2;\n"
    301       "                 //user:pass@www.igs-ip.net:2101/FFMJ00DEU0 RTCM_3.1 DEU 50.09 8.66 no 2\"}\n"
     300      "                 \"//user:pass@igs-ip.net:2101/FFMJ00DEU1 RTCM_3.1 DEU 50.09 8.66 no 2;\n"
     301      "                 //user:pass@igs-ip.net:2101/FFMJ00DEU0 RTCM_3.1 DEU 50.09 8.66 no 2\"}\n"
    302302      "   ntripVersion  {Ntrip Version [character string: 1|2|2s|R|U]}\n"
    303303      "   casterUrlList {Visited Broadcasters [character string, comma separated list]}\n"
    … …  
    323323      " --key reqcRnxVersion 2 --key reqcSampling 30 sec --key reqcV2Priority G:12&PWCSLX G:5&IQX\n"
    324324      "(6) bnc --key mountPoints \"//user:pass@mgex.igs-ip.net:2101/CUT000AUS0 RTCM_3.0 ETH 9.03 38.74 no 2;"
    325       "//user:pass@www.igs-ip.net:2101/FFMJ00DEU1 RTCM_3.1 DEU 50.09 8.66 no 2\"\n"
     325      "//user:pass@igs-ip.net:2101/FFMJ00DEU1 RTCM_3.1 DEU 50.09 8.66 no 2\"\n"
    326326      "(7) bnc --key cmbStreams \"CLK11 BLG 1.0;CLK93 CNES 1.0\"\n"
    327327      "(8) bnc --key uploadMountpointsOut \"products.igs-ip.net,98756,TEST,letmein,IGS14,2,/Users/weber/BNC${GPSWD}.clk,,33,3,2;"
    328       "www.euref-ip.net,333,TEST2,aaaaa,ETRF2000,2,,,33,5,5\"\n"
     328      "euref-ip.net,333,TEST2,aaaaa,ETRF2000,2,,,33,5,5\"\n"
    329329      "(9) bnc --key PPP/staTable \"FFMJ00DEU1,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7777;"
    330330      "CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,7778\"\n";

  • trunk/BNC/src/bncsettings.cpp

    r9292 r9404  
    6666    setValue_p("font",                "");
    6767    setValue_p("casterUrlList", (QStringList()
    68                                << "http://user:pass@www.euref-ip.net:2101"
    69                                << "http://user:pass@www.igs-ip.net:2101"
     68                               << "http://user:pass@euref-ip.net:2101"
     69                               << "http://user:pass@igs-ip.net:2101"
    7070                               << "http://user:pass@products.igs-ip.net:2101"
    7171                               << "http://user:pass@mgex.igs-ip.net:2101"));

  • trunk/BNC/src/bnctabledlg.cpp

    r8500 r9404  
    110110  // WhatsThis, Add Streams from Caster, Top
    111111  // ---------------------------------------
    112   _casterHostComboBox->setWhatsThis(tr("<p>Enter the Ntrip Broadcaster URL or IP number.</p><p>Note that EUREF and IGS operate Ntrip Broadcasters at <u>www.euref-ip.net</u>, <u>www.igs-ip.net</u>, <u>products.igs-ip.net</u>, and <u>mgex.igs-ip.net</u>.</p>"));
     112  _casterHostComboBox->setWhatsThis(tr("<p>Enter the Ntrip Broadcaster URL or IP number.</p><p>Note that EUREF and IGS operate Ntrip Broadcasters at <u>euref-ip.net</u>, <u>igs-ip.net</u>, <u>products.igs-ip.net</u>, and <u>mgex.igs-ip.net</u>.</p>"));
    113113  _casterPortLineEdit->setWhatsThis(tr("<p>Enter the Ntrip Broadcaster port number.</p></p>Note that 80 and 2101 are often used port numbers. Note further that Ntrip Version 2 via SSL usually requires specifying port 443.</p>"));
    114   _buttonCasterTable->setWhatsThis(tr("<p>Hit 'Show' for a table of known Ntrip Broadcaster installations as maintained at <u>http://www.rtcm-ntrip.org/home.</u></p><p>A window opens which allows to select a broadcaster for stream retrieval.</p>"));
    115   _casterUserLineEdit->setWhatsThis(tr("<p>Access to streams on Ntrip Broadcasters can be restricted. You may need to enter a valid 'User' ID and 'Password' for access to protected streams.</p><p>Accounts are usually provided per Ntrip Broadcaster following a registration process. Register via <u>https://registration.rtcm-ntrip.org</u> for access to protected streams on <u>www.euref-ip.net</u>, <u>www.igs-ip.net</u>, <u>products.igs-ip.net</u>, or <u>mges.igs-ip.net</u>.</p>"));
     114  _buttonCasterTable->setWhatsThis(tr("<p>Hit 'Show' for a table of known Ntrip Broadcaster installations as maintained at <u>http://rtcm-ntrip.org/home.</u></p><p>A window opens which allows to select a broadcaster for stream retrieval.</p>"));
     115  _casterUserLineEdit->setWhatsThis(tr("<p>Access to streams on Ntrip Broadcasters can be restricted. You may need to enter a valid 'User' ID and 'Password' for access to protected streams.</p><p>Accounts are usually provided per Ntrip Broadcaster following a registration process. Register via <u>https://registration.rtcm-ntrip.org</u> for access to protected streams on <u>euref-ip.net</u>, <u>igs-ip.net</u>, <u>products.igs-ip.net</u>, or <u>mges.igs-ip.net</u>.</p>"));
    116116  _casterPasswordLineEdit->setWhatsThis(tr("<p>Enter a valid 'Password' for access to protected streams.</p>"));
    117117  _ntripVersionComboBox->setWhatsThis(tr("<p>Select the Ntrip transport protocol version you want to use. Implemented options are:<br>&nbsp; 1:&nbsp; Ntrip Version 1, TCP/IP<br>&nbsp; 2:&nbsp; Ntrip Version 2, TCP/IP mode<br>&nbsp; 2s:&nbsp; Ntrip Version 2 TCP/IP mode via SSL (usually port 443)<br>&nbsp; R:&nbsp; Ntrip Version 2, RTSP/RTP mode<br>&nbsp; U:&nbsp; Ntrip Version 2, UDP mode<br>Select option '1' if you are not sure whether the Ntrip Broadcaster supports Ntrip Version 2.</p><p>Note that RTSP/RTP (option 'R') and UDP (option 'U') are not accepted by proxies and sometimes not supported by mobile Internet Service Providers.</p>"));
    … …  
    526526
    527527  QUrl url;
    528   url.setHost("www.rtcm-ntrip.org");
     528  url.setHost("rtcm-ntrip.org");
    529529  url.setPath("/");
    530530  if (ntripVersion == "2s") {
    … …  
    621621  _whatsThisButton->setMaximumWidth(12*ww);
    622622
    623   // WhatsThis, List of Ntrip Broadcasters from www.rtcm-ntrip.org
     623  // WhatsThis, List of Ntrip Broadcasters from rtcm-ntrip.org
    624624  // -------------------------------------------------------------
    625   _casterTable->setWhatsThis(tr("<p>Select an Ntrip Broadcaster and hit 'OK'.</p><p>See <u>http://www.rtcm-ntrip.org/home</u> for further details on known Ntrip Broadcaster installations.</u>"));
     625  _casterTable->setWhatsThis(tr("<p>Select an Ntrip Broadcaster and hit 'OK'.</p><p>See <u>http://rtcm-ntrip.org/home</u> for further details on known Ntrip Broadcaster installations.</u>"));
    626626
    627627  QGridLayout* dlgLayout = new QGridLayout();
    628   dlgLayout->addWidget(new QLabel("  List of Ntrip Broadcasters from www.rtcm-ntrip.org"), 0,0,1,3,Qt::AlignLeft);
     628  dlgLayout->addWidget(new QLabel("  List of Ntrip Broadcasters from rtcm-ntrip.org"), 0,0,1,3,Qt::AlignLeft);
    629629  dlgLayout->addWidget(_casterTable,     1, 0, 1, 3);
    630630  dlgLayout->addWidget(_whatsThisButton, 2, 0);
Note: See TracChangeset for help on using the changeset viewer.