Index: trunk/BNC/src/bnccaster.cpp
===================================================================
--- trunk/BNC/src/bnccaster.cpp	(revision 7175)
+++ trunk/BNC/src/bnccaster.cpp	(revision 7176)
@@ -428,8 +428,8 @@
     if (!existFlg) {
       QByteArray format    = hlp[1].toAscii();
-      QByteArray latitude  = hlp[2].toAscii();
-      QByteArray longitude = hlp[3].toAscii();
-      QByteArray nmea      = hlp[4].toAscii();
-      QByteArray ntripVersion = hlp[5].toAscii();
+      QByteArray latitude  = hlp[3].toAscii();
+      QByteArray longitude = hlp[4].toAscii();
+      QByteArray nmea      = hlp[5].toAscii();
+      QByteArray ntripVersion = hlp[6].toAscii();
       
       bncGetThread* getThread = new bncGetThread(url, format, latitude, 
Index: trunk/BNC/src/bnctabledlg.cpp
===================================================================
--- trunk/BNC/src/bnctabledlg.cpp	(revision 7175)
+++ trunk/BNC/src/bnctabledlg.cpp	(revision 7176)
@@ -291,5 +291,5 @@
       QStringList columns = lines[nRow].split(";");
       for (int ic = 1; ic < columns.size(); ic++) {
-        if (ic == 11) { 
+            if (ic == 11) {
           if (columns[ic] == "0") { 
             columns[ic] = "no"; 
@@ -373,7 +373,8 @@
   if (_table) {
     for (int ir = 0; ir < _table->rowCount(); ir++) {
-      QTableWidgetItem* item   = _table->item(ir,0);
+      QTableWidgetItem*   item = _table->item(ir,0);
       QString             site = _table->item(ir,0)->text();
       QString           format = _table->item(ir,2)->text();
+      QString          country = _table->item(ir,7)->text();
       QString         latitude = _table->item(ir,8)->text();
       QString        longitude = _table->item(ir,9)->text();
@@ -382,7 +383,7 @@
       if (_table->isItemSelected(item)) {
         url.setPath(item->text());
-        mountPoints->push_back(url.toString() + " " + format + " " + latitude
+        mountPoints->push_back(url.toString() + " " + format + " " + country + " " + latitude
                         + " " + longitude + " " + nmea + " " + ntripVersion);
-         
+
         site.resize(4);
       }
Index: trunk/BNC/src/bncwindow.cpp
===================================================================
--- trunk/BNC/src/bncwindow.cpp	(revision 7175)
+++ trunk/BNC/src/bncwindow.cpp	(revision 7176)
@@ -112,5 +112,5 @@
   int ww = QFontMetrics(this->font()).width('w');
   
-  static const QStringList labels = QString("account, Streams:   resource loader / mountpoint, decoder, lat, long, nmea, ntrip, bytes").split(",");
+  static const QStringList labels = QString("account, Streams:   resource loader / mountpoint, decoder, country, lat, long, nmea, ntrip, bytes").split(",");
 
   setMinimumSize(100*ww, 70*ww);
@@ -400,12 +400,13 @@
   // Streams
   // -------
-  _mountPointsTable   = new QTableWidget(0,8);
+  _mountPointsTable   = new QTableWidget(0,9);
 
   _mountPointsTable->horizontalHeader()->resizeSection(1,34*ww);
   _mountPointsTable->horizontalHeader()->resizeSection(2,9*ww);
-  _mountPointsTable->horizontalHeader()->resizeSection(3,7*ww); 
-  _mountPointsTable->horizontalHeader()->resizeSection(4,7*ww); 
-  _mountPointsTable->horizontalHeader()->resizeSection(5,5*ww); 
-  _mountPointsTable->horizontalHeader()->resizeSection(6,5*ww); 
+  _mountPointsTable->horizontalHeader()->resizeSection(3,9*ww);
+  _mountPointsTable->horizontalHeader()->resizeSection(4,7*ww);
+  _mountPointsTable->horizontalHeader()->resizeSection(5,7*ww);
+  _mountPointsTable->horizontalHeader()->resizeSection(6,5*ww);
+  _mountPointsTable->horizontalHeader()->resizeSection(7,5*ww);
   _mountPointsTable->horizontalHeader()->setResizeMode(QHeaderView::Interactive);
   _mountPointsTable->horizontalHeader()->setStretchLastSection(true);
@@ -1406,12 +1407,12 @@
 
     QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
-    QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
-    QString nmea(hlp[4]);
-    if (hlp[5] == "S") {
+    QString format(hlp[1]); QString country(hlp[2]); QString latitude(hlp[3]); QString longitude(hlp[4]);
+    QString nmea(hlp[5]);
+    if (hlp[6] == "S") {
       fullPath = hlp[0].replace(0,2,"");
     }
     QString ntripVersion = "2";
-    if (hlp.size() >= 6) {
-      ntripVersion = (hlp[5]);
+    if (hlp.size() >= 7) {
+      ntripVersion = (hlp[6]);
     }
 
@@ -1428,29 +1429,33 @@
     _mountPointsTable->setItem(iRow, 2, it);
 
+    it = new QTableWidgetItem(country);
+    _mountPointsTable->setItem(iRow, 3, it);
+
     if      (nmea == "yes") {
-    it = new QTableWidgetItem(latitude);
-    _mountPointsTable->setItem(iRow, 3, it);
-    it = new QTableWidgetItem(longitude);
-    _mountPointsTable->setItem(iRow, 4, it);
+      it = new QTableWidgetItem(latitude);
+      _mountPointsTable->setItem(iRow, 4, it);
+      it = new QTableWidgetItem(longitude);
+      _mountPointsTable->setItem(iRow, 5, it);
     } else {
-    it = new QTableWidgetItem(latitude);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 3, it);
-    it = new QTableWidgetItem(longitude);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 4, it);
+      it = new QTableWidgetItem(latitude);
+      it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+      _mountPointsTable->setItem(iRow, 4, it);
+
+      it = new QTableWidgetItem(longitude);
+      it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+      _mountPointsTable->setItem(iRow, 5, it);
     }
 
     it = new QTableWidgetItem(nmea);
     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 5, it);
+    _mountPointsTable->setItem(iRow, 6, it);
 
     it = new QTableWidgetItem(ntripVersion);
     ////    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 6, it);
+    _mountPointsTable->setItem(iRow, 7, it);
 
     bncTableItem* bncIt = new bncTableItem();
     bncIt->setFlags(bncIt->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 7, bncIt);
+    _mountPointsTable->setItem(iRow, 8, bncIt);
 
     iRow++;
@@ -1562,12 +1567,12 @@
     QUrl    url(hlp[0]);
     QString fullPath = url.host() + QString(":%1").arg(url.port()) + url.path();
-    QString format(hlp[1]); QString latitude(hlp[2]); QString longitude(hlp[3]);
-    QString nmea(hlp[4]);
-    if (hlp[5] == "S") {
+    QString format(hlp[1]); QString country(hlp[2]); QString latitude(hlp[3]); QString longitude(hlp[4]);
+    QString nmea(hlp[5]);
+    if (hlp[6] == "S") {
       fullPath = hlp[0].replace(0,2,"");
     }
     QString ntripVersion = "2";
-    if (hlp.size() >= 6) {
-      ntripVersion = (hlp[5]);
+    if (hlp.size() >= 7) {
+      ntripVersion = (hlp[6]);
     }
 
@@ -1586,28 +1591,31 @@
     _mountPointsTable->setItem(iRow, 2, it);
 
+    it = new QTableWidgetItem(country);
+    _mountPointsTable->setItem(iRow, 3, it);
+
     if      (nmea == "yes") {
     it = new QTableWidgetItem(latitude);
-    _mountPointsTable->setItem(iRow, 3, it);
+    _mountPointsTable->setItem(iRow, 4, it);
     it = new QTableWidgetItem(longitude);
-    _mountPointsTable->setItem(iRow, 4, it);
+    _mountPointsTable->setItem(iRow, 5, it);
     } else {
     it = new QTableWidgetItem(latitude);
     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 3, it);
+    _mountPointsTable->setItem(iRow, 4, it);
     it = new QTableWidgetItem(longitude);
     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 4, it);
+    _mountPointsTable->setItem(iRow, 5, it);
     }
 
     it = new QTableWidgetItem(nmea);
     it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 5, it);
+    _mountPointsTable->setItem(iRow, 6, it);
 
     it = new QTableWidgetItem(ntripVersion);
-    it->setFlags(it->flags() & ~Qt::ItemIsEditable);
-    _mountPointsTable->setItem(iRow, 6, it);
+    ////it->setFlags(it->flags() & ~Qt::ItemIsEditable);
+    _mountPointsTable->setItem(iRow, 7, it);
 
     bncTableItem* bncIt = new bncTableItem();
-    _mountPointsTable->setItem(iRow, 7, bncIt);
+    _mountPointsTable->setItem(iRow, 8, bncIt);
 
     iRow++;
@@ -1644,5 +1652,6 @@
                  + " " + _mountPointsTable->item(iRow, 4)->text()
                  + " " + _mountPointsTable->item(iRow, 5)->text()
-                 + " " + _mountPointsTable->item(iRow, 6)->text());
+                 + " " + _mountPointsTable->item(iRow, 6)->text()
+                 + " " + _mountPointsTable->item(iRow, 7)->text());
     } else {
       mountPoints.append( 
@@ -1652,5 +1661,6 @@
                  + " " + _mountPointsTable->item(iRow, 4)->text()
                  + " " + _mountPointsTable->item(iRow, 5)->text()
-                 + " " + _mountPointsTable->item(iRow, 6)->text());
+                 + " " + _mountPointsTable->item(iRow, 6)->text()
+                 + " " + _mountPointsTable->item(iRow, 7)->text());
     }
   }
@@ -2059,7 +2069,7 @@
                 "@"  + _mountPointsTable->item(iRow, 1)->text() );
       if (url                                      == thread->mountPoint() &&
-          _mountPointsTable->item(iRow, 3)->text() == thread->latitude()   &&
-          _mountPointsTable->item(iRow, 4)->text() == thread->longitude() ) {
-        ((bncTableItem*) _mountPointsTable->item(iRow, 7))->setGetThread(thread);
+          _mountPointsTable->item(iRow, 4)->text() == thread->latitude()   &&
+          _mountPointsTable->item(iRow, 5)->text() == thread->longitude() ) {
+        ((bncTableItem*) _mountPointsTable->item(iRow, 8))->setGetThread(thread);
         disconnect(thread, SIGNAL(newBytes(QByteArray, double)),
                   _bncFigure, SLOT(slotNewData(QByteArray, double)));