Changeset 9235 in ntrip for branches

Timestamp:

Nov 10, 2020, 11:00:43 AM (5 years ago)

Author:

stuerze

Message:

pppMap now with OSM only

Location:

branches/BNC_2.12

Files:

• Example_Configs/01_RinexObs.bnc (modified) (1 diff)
• Example_Configs/02_RinexEph.bnc (modified) (1 diff)
• Example_Configs/03_BrdcCorr.bnc (modified) (1 diff)
• Example_Configs/04_RinexConcat.bnc (modified) (1 diff)
• Example_Configs/05_RinexQC.bnc (modified) (1 diff)
• Example_Configs/06_RTK.bnc (modified) (1 diff)
• Example_Configs/07_FeedEngine.bnc (modified) (1 diff)
• Example_Configs/08_PPP.bnc (modified) (1 diff)
• Example_Configs/09_PPPNet.bnc (modified) (1 diff)
• Example_Configs/10_PPPQuickStart.bnc (modified) (1 diff)
• Example_Configs/11_PPPPostProc.bnc (modified) (1 diff)
• Example_Configs/12_PPPOsm.bnc (moved) (moved from branches/BNC_2.12/Example_Configs/12_PPPGoogleMaps.bnc ) (1 diff)
• Example_Configs/13_SPPQuickStart.bnc (modified) (1 diff)
• Example_Configs/14_SaveSp3.bnc (modified) (1 diff)
• Example_Configs/15_Sp3ETRFPPP.bnc (modified) (1 diff)
• Example_Configs/16_Upload.bnc (modified) (1 diff)
• Example_Configs/17_Combi.bnc (modified) (1 diff)
• Example_Configs/18_CombiPPP.bnc (modified) (1 diff)
• Example_Configs/19_UploadEph.bnc (modified) (1 diff)
• Example_Configs/20_CompareSp3.bnc (modified) (1 diff)
• Example_Configs/21_Empty.bnc (modified) (1 diff)
• src/bnc.qrc (modified) (1 diff)
• src/bncmain.cpp (modified) (1 diff)
• src/bncwindow.cpp (modified) (3 diffs)
• src/map/bncmapwin.cpp (modified) (7 diffs)
• src/map/map_gm.html (deleted)
• src/map/map_osb.html (deleted)
• src/pppWidgets.cpp (modified) (5 diffs)
• src/pppWidgets.h (modified) (1 diff)
• src/src.pri (modified) (1 diff)

branches/BNC_2.12/Example_Configs/01_RinexObs.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/02_RinexEph.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=","
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/03_BrdcCorr.bnc ¶

@@ -157 +157 @@
 snxtroSol=
 staTable=
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/04_RinexConcat.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/05_RinexQC.bnc ¶

@@ -157 +157 @@
 snxtroSol=
 staTable=
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/06_RTK.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/07_FeedEngine.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,,,,,,,,,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/08_PPP.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,,"
-useGoogleMap=false
-useOpenStreetMap=true
 v3filenames=0

branches/BNC_2.12/Example_Configs/09_PPPNet.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="FFMJ00DEU0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,,", "CUT000AUS0,100.0,100.0,100.0,100.0,100.0,100.0,0.1,3e-6,,"
-useGoogleMap=false
-useOpenStreetMap=true
 v3filenames=0

branches/BNC_2.12/Example_Configs/10_PPPQuickStart.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,7777,"
-useGoogleMap=true
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/11_PPPPostProc.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="CUT07,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
-useGoogleMap=false
-useOpenStreetMap=true
 v3filenames=0

branches/BNC_2.12/Example_Configs/12_PPPOsm.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="VM01,100,100,100,100,100,100,0.1,3e-6,,"
-useGoogleMap=false
-useOpenStreetMap=true
 v3filenames=0

branches/BNC_2.12/Example_Configs/13_SPPQuickStart.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="CUT000AUS0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
-useGoogleMap=false
-useOpenStreetMap=true
 v3filenames=0

branches/BNC_2.12/Example_Configs/14_SaveSp3.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,,,,,,,,,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/15_Sp3ETRFPPP.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
-useGoogleMap=false
-useOpenStreetMap=true
 v3filenames=0

branches/BNC_2.12/Example_Configs/16_Upload.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,,,,,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/17_Combi.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,,,,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/18_CombiPPP.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable="FFMJ00DEU0,0.01,0.01,0.01,100.0,100.0,100.0,0.1,3e-6,,"
-useGoogleMap=true
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/19_UploadEph.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=",,,,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/20_CompareSp3.bnc ¶

@@ -157 +157 @@
 snxtroSol=
 staTable=",,"
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/Example_Configs/21_Empty.bnc ¶

@@ -158 +158 @@
 snxtroSol=
 staTable=
-useGoogleMap=false
-useOpenStreetMap=false
 v3filenames=0

branches/BNC_2.12/src/bnc.qrc ¶

@@ -55 +55 @@
 </qresource>
 <qresource>
-    <file>map/map_gm.html</file>
     <file>map/map_osm.html</file>
     <file>map/crosshair.png</file>

branches/BNC_2.12/src/bncmain.cpp ¶

@@ -238 +238 @@
       "   PPP/plotCoordinates  {Mountpoint for time series plot [character string]}\n"
       "   PPP/audioResponse    {Audio response threshold in meters [floating-point number]}\n"
-      "   PPP/useOpenStreetMap {OSM track map [character string: true|false]}\n"
-      "   PPP/useGoogleMap     {Google track map [character string: true|false]}\n"
       "   PPP/mapWinDotSize    {Size of dots on map [integer number: 0-10]}\n"
       "   PPP/mapWinDotColor   {Color of dots and cross hair on map [character string: red|yellow]}\n"

branches/BNC_2.12/src/bncwindow.cpp ¶

@@ -985 +985 @@
   pppLayout4->addWidget(_pppWidgets._audioResponse,                      ir, 4, Qt::AlignLeft);
   pppLayout4->addWidget(new QLabel("Audio response"),                    ir, 5, Qt::AlignRight);
-
   ++ir;
   pppLayout4->addWidget(new QLabel("Track map"),                         ir, 0, Qt::AlignLeft);
   pppLayout4->addWidget(_pppWidgets._mapWinButton,                       ir, 1, Qt::AlignLeft);
-  pppLayout4->addWidget(new QLabel("OSM"),                               ir, 2, Qt::AlignLeft);
-  pppLayout4->addWidget(_pppWidgets._useOpenStreetMap,                   ir, 3, Qt::AlignLeft);
-  pppLayout4->addWidget(new QLabel("Google"),                            ir, 3, Qt::AlignRight);
-  pppLayout4->addWidget(_pppWidgets._useGoogleMap,                       ir, 4, Qt::AlignLeft);
   ++ir;
   pppLayout4->addWidget(new QLabel("Dot-properties"),                    ir, 0, Qt::AlignLeft);
@@ -2799 +2794 @@
   saveOptions();
   enableWidget(false, _pppWidgets._mapWinButton);
-  enableWidget(false, _pppWidgets._useGoogleMap);
-  enableWidget(false, _pppWidgets._useOpenStreetMap);
   enableWidget(false, _pppWidgets._mapWinDotSize);
   enableWidget(false, _pppWidgets._mapWinDotColor);
@@ -2822 +2815 @@
 #ifdef QT_WEBKIT
   enableWidget(true, _pppWidgets._mapWinButton);
-  enableWidget(true, _pppWidgets._useGoogleMap);
-  enableWidget(true, _pppWidgets._useOpenStreetMap);
   enableWidget(true, _pppWidgets._mapWinDotSize);
   enableWidget(true, _pppWidgets._mapWinDotColor);

branches/BNC_2.12/src/map/bncmapwin.cpp ¶

@@ -35 +35 @@
  * Created:    08-Jun-2013
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -75 +75 @@
   loadHtmlPage();
 
-  _webView->show();  
+  _webView->show();
 
   _statusLabel = new QLabel;
@@ -99 +99 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::loadHtmlPage() {
@@ -106 +106 @@
 
   QFile htmlFile;
-  if (settings.value("PPP/useOpenStreetMap").toBool()) {
-    htmlFile.setFileName(":/map/map_osm.html");
-  }
-  else {
-    htmlFile.setFileName(":/map/map_gm.html");
-  }
+  htmlFile.setFileName(":/map/map_osm.html");
   if (!htmlFile.open(QFile::ReadOnly)) {
     qDebug() << "bncMapWin:: cannot open html file";
@@ -123 +118 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::slotInitMap(bool isOk) {
@@ -139 +134 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::gotoLocation(double lat, double lon) {
@@ -166 +161 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::slotNewPosition(QByteArray staID, bncTime /* time */, QVector<double> xx) {

branches/BNC_2.12/src/pppWidgets.cpp ¶

@@ -91 +91 @@
   _plotCoordinates  = new QLineEdit;    _plotCoordinates ->setObjectName("PPP/plotCoordinates");  _widgets << _plotCoordinates;
   _mapWinButton     = new QPushButton;  _mapWinButton    ->setObjectName("PPP/mapWinButton");     _widgets << _mapWinButton;
-  _useGoogleMap     = new QRadioButton; _useGoogleMap    ->setObjectName("PPP/useGoogleMap");     _widgets << _useGoogleMap;
-  _useOpenStreetMap = new QRadioButton; _useOpenStreetMap->setObjectName("PPP/useOpenStreetMap"); _widgets << _useOpenStreetMap;
   _audioResponse    = new QLineEdit;    _audioResponse   ->setObjectName("PPP/audioResponse");    _widgets << _audioResponse;
   _mapWinDotSize    = new QLineEdit;    _mapWinDotSize   ->setObjectName("PPP/mapWinDotSize");    _widgets << _mapWinDotSize;
@@ -199 +197 @@
   _audioResponse->setWhatsThis(tr("<p>Specify an 'Audio response' threshold in meters. A beep is produced by BNC whenever a horizontal PPP coordinate component differs by more than the threshold value from the a priori marker coordinate.</p><p>Default is an empty option field, meaning that you don't want BNC to produce alarm signals.</p>"));
   _mapWinButton->setWhatsThis(tr("<p>You may like to track your rover position using Google Maps or Open Street Map as a background map. A 'Track map' can be produced with BNC in 'Real-Time Streams' or 'RINEX files' PPP mode.</p><p>The 'Open Map' button opens a windows showing a map according to specified options.</p><p>Even in 'RINEX files' post processing mode you should not forget to specify a proxy under the 'Network' tab if that is operated in front of BNC because the program needs to download the map data.</p>"));
-  _useGoogleMap->setWhatsThis(tr("<p>Specify Google Maps as the background for your rover positions.</p>"));
-  _useOpenStreetMap->setWhatsThis(tr("<p>Specify Open Street Map as the background for your rover positions.</p>"));
   _mapWinDotSize->setWhatsThis(tr("<p>Specify the size of dots showing rover positions on the track map.</p><p>A dot size of '3' may be appropriate. The maximum possible dot size is '10'. An empty option field or a size of '0' would mean that you don't want BNC to show the rover's track on the map.</p>"));
   _mapWinDotColor->setWhatsThis(tr("<p>Specify the color of dots showing the rover track on the map.</p>"));
@@ -248 +244 @@
   delete _plotCoordinates;
   delete _mapWinButton;
-  delete _useGoogleMap;
-  delete _useOpenStreetMap;
   delete _audioResponse;
   delete _mapWinDotSize;
@@ -378 +372 @@
   _plotCoordinates ->setText(settings.value(_plotCoordinates->objectName()).toString());
   _audioResponse   ->setText(settings.value(_audioResponse->objectName()).toString());
-  _useGoogleMap    ->setChecked(settings.value(_useGoogleMap->objectName()).toBool());
-  _useOpenStreetMap->setChecked(settings.value(_useOpenStreetMap->objectName()).toBool());
   _mapWinDotSize   ->setText(settings.value(_mapWinDotSize->objectName()).toString());
 
@@ -444 +436 @@
   settings.setValue(_plotCoordinates ->objectName(), _plotCoordinates ->text());
   settings.setValue(_audioResponse   ->objectName(), _audioResponse   ->text());
-  settings.setValue(_useGoogleMap    ->objectName(), _useGoogleMap    ->isChecked());
-  settings.setValue(_useOpenStreetMap->objectName(), _useOpenStreetMap->isChecked());
   settings.setValue(_mapWinDotSize   ->objectName(), _mapWinDotSize   ->text());
   settings.setValue(_mapWinDotColor  ->objectName(), _mapWinDotColor  ->currentText());

branches/BNC_2.12/src/pppWidgets.h ¶

@@ -74 +74 @@
   QLineEdit*     _plotCoordinates;
   QPushButton*   _mapWinButton;
-  QRadioButton*  _useGoogleMap;
-  QRadioButton*  _useOpenStreetMap;
   QLineEdit*     _audioResponse;
   QLineEdit*     _mapWinDotSize;

branches/BNC_2.12/src/src.pri ¶

@@ -162 +162 @@
   HEADERS     += map/bncmapwin.h
   SOURCES     += map/bncmapwin.cpp
-  OTHER_FILES += map/map_gm.html map/map_osm.html
+  OTHER_FILES += map/map_osm.html
 }
 else {