Index: branches/BNC_2.12/src/map/bncmapwin.cpp
===================================================================
--- branches/BNC_2.12/src/map/bncmapwin.cpp	(revision 7868)
+++ branches/BNC_2.12/src/map/bncmapwin.cpp	(revision 9235)
@@ -35,5 +35,5 @@
  * Created:    08-Jun-2013
  *
- * Changes:    
+ * Changes:
  *
  * -----------------------------------------------------------------------*/
@@ -75,5 +75,5 @@
   loadHtmlPage();
 
-  _webView->show();  
+  _webView->show();
 
   _statusLabel = new QLabel;
@@ -99,5 +99,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::loadHtmlPage() {
@@ -106,10 +106,5 @@
 
   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,5 +118,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::slotInitMap(bool isOk) {
@@ -139,5 +134,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::gotoLocation(double lat, double lon) {
@@ -166,5 +161,5 @@
 }
 
-// 
+//
 ////////////////////////////////////////////////////////////////////////////
 void bncMapWin::slotNewPosition(QByteArray staID, bncTime /* time */, QVector<double> xx) {
Index: branches/BNC_2.12/src/map/map_gm.html
===================================================================
--- branches/BNC_2.12/src/map/map_gm.html	(revision 7868)
+++ 	(revision )
@@ -1,96 +1,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta name="viewport" content="initial-scale=1.0, user-scalable=yes" />
-
-    <style type="text/css">
-        * { margin: 0; padding: 0; }
-        html { width: 100%; height: 100%; }
-        body { width: 100%; height: 100%; }
-        #map_canvas { width: 100%; height: 100%; background-color: gray; }
-    </style>
-
-    <script>
-      var map;
-      var marker;
-      var zoom;
-      var dotSize;
-      var dotColor;
-      var traceIcon;
-      
-      function initialize(lat, lon, mapWinDotSize, mapWinDotColor) {
-        dotSize = mapWinDotSize;
-	dotColor = mapWinDotColor;
-	if (dotSize > 10) dotSize = 10;
-
-        var myOptions = {
-          center:     new google.maps.LatLng(lat, lon),
-          zoom:       3,
-          mapTypeId:  google.maps.MapTypeId.SATELLITE,
-          panControl: true
-        };
-      
-        map  = new google.maps.Map(document.getElementById("map_canvas"), myOptions);
-        zoom = 0;       
-
-        var image = new google.maps.MarkerImage("qrc:///map/crosshair.png",
-                                                null, 
-                                                null,
-                                                new google.maps.Point(20, 20),
-                                                new google.maps.Size(40,40)
-                                               );
-
-        if (dotColor == 1) {
-          traceIcon = new google.maps.MarkerImage("qrc:///map/reddot.png",
-                                                null, 
-                                                null,
-                                                new google.maps.Point(dotSize/2, dotSize/2),
-                                                new google.maps.Size(dotSize, dotSize)
-						);
-	}
-  
-
-        if (dotColor == 2) {
-          traceIcon = new google.maps.MarkerImage("qrc:///map/yellowdot.png",
-                                                null, 
-                                                null,
-                                                new google.maps.Point(dotSize/2, dotSize/2),
-                                                new google.maps.Size(dotSize, dotSize)
-						);
-	}
-
-        marker = new google.maps.Marker({
-          map:      map,
-          position: new google.maps.LatLng(lat, lon),
-          icon:     image,
-        });
-      }
-      
-      function gotoLocation(lat, lon) {
-        if (zoom == 0) {
-          zoom = 17;
-          map.setZoom(zoom);
-        }
-        var position = new google.maps.LatLng(lat, lon);
-        map.setCenter(position);
-        marker.setPosition(position);
-
-        if (dotSize > 0) {
-          var trace = new google.maps.Marker({
-            map:      map,
-            position: position,
-            icon:     traceIcon,
-          });
-        }
-      }
-    </script>
-
-    <script type="text/javascript"
-      src="http://maps.googleapis.com/maps/api/js?sensor=false">
-    </script>
-
-  </head>
-  <body>
-    <div id="map_canvas">Waiting for data...</div>
-  </body>
-</html>
Index: branches/BNC_2.12/src/map/map_osb.html
===================================================================
--- branches/BNC_2.12/src/map/map_osb.html	(revision 7868)
+++ 	(revision )
@@ -1,110 +1,0 @@
-<!DOCTYPE HTML>
-<html>
-
-  <head>
-    <title>BNC OpenStreetMap View</title>
-    <style type="text/css">
-      html, body, #basicMap {
-          width: 100%;
-          height: 100%;
-          margin: 0;
-      }
-    </style>
-
-    <script src="http://openlayers.org/api/OpenLayers.js" ></script>
-
-    <script>
-      var map;
-      var markers;
-      var marker;
-      var icon;  
-      var traceIcon;
-      var fromProjection;
-      var toProjection;
-      var useTrace;
-      var zoom;
-
-      OpenLayers.Layer.OSM.StreetBrowser = OpenLayers.Class(OpenLayers.Layer.OSM, {
-        /**
-         * Constructor: OpenLayers.Layer.OSM.StreetBrowser
-         *
-         * Parameters:
-         * name - {String}
-         * options - {Object} Hashtable of extra options to tag onto the layer
-         */
-        initialize: function(name, options) {
-          var url = [
-              "http://tiles-base.openstreetbrowser.org/tiles/basemap_base/${z}/${x}/${y}.png"
-          ];
-          options = OpenLayers.Util.extend({
-            numZoomLevels: 18,
-            buffer: 0,
-            transitionEffect: "resize"
-          }, options);
-          var newArguments = [name, url, options];
-          OpenLayers.Layer.XYZ.prototype.initialize.apply(this, newArguments);
-        },
-    
-        CLASS_NAME: "OpenLayers.Layer.OSM.StreetBrowser"
-      });
-
-      function initialize(lat, lon, trace) {
-        useTrace = trace;
-
-        map = new OpenLayers.Map("basicMap",
-                                 {controls:[
-                                  new OpenLayers.Control.Navigation(),
-                                  new OpenLayers.Control.PanZoomBar()]});
-        fromProjection = new OpenLayers.Projection("EPSG:4326");   // WGS 1984
-        toProjection   = new OpenLayers.Projection("EPSG:900913"); // Spherical Mercator
-        zoom           = 0; 
-
-        var mapnik   = new OpenLayers.Layer.OSM.StreetBrowser();
-        var position = new OpenLayers.LonLat(lon, lat).transform(fromProjection, toProjection);
- 
-        map.addLayer(mapnik);
-
-        var size    = new OpenLayers.Size(40,40);
-        var offset  = new OpenLayers.Pixel(-size.w/2, -size.h/2);
-        icon        = new OpenLayers.Icon("qrc:///map/crosshair.png", size, offset);
-
-        var sizeT   = new OpenLayers.Size(2,2);
-        var offsetT = new OpenLayers.Pixel(-sizeT.w/2, -13);
-        traceIcon   = new OpenLayers.Icon("qrc:///map/reddot.png", sizeT, offsetT);
-
-        markers = new OpenLayers.Layer.Markers("Markers");
-        marker  = new OpenLayers.Marker(position, icon);
-        markers.addMarker(marker);
-        
-        map.addLayer(markers);
-
-        map.setCenter(position, 3);
-      }
-
-      function gotoLocation(lat, lon) {
-        var position = new OpenLayers.LonLat(lon, lat).transform(fromProjection, toProjection);
-        if (zoom == 0) {
-          zoom = 15;
-          map.setCenter(position, zoom);
-        }
-        else {
-          map.setCenter(position);
-        }
-        markers.removeMarker(marker);
-        marker = new OpenLayers.Marker(position, icon);
-        markers.addMarker(marker);
-        if (useTrace == 1) {
-          var trace = new OpenLayers.Marker(position, traceIcon.clone());
-          markers.addMarker(trace);
-        }
-      }
-
-    </script>
-
-  </head>
-
-  <body>
-    <div id="basicMap"></div>
-  </body>
-
-</html>
