Changeset 9243 in ntrip for trunk/BNC/src/map

Timestamp:

Nov 11, 2020, 3:08:20 PM (4 years ago)

Author:

stuerze

Message:

minor changes

Location:

trunk/BNC/src/map

Files:

• bncmapwin.cpp (modified) (1 diff)
• map_osm.html (modified) (4 diffs)

trunk/BNC/src/map/bncmapwin.cpp

@@ -121 +121 @@
   }
   QString location = QString("%1, %2, %3, %4").arg(_currLat,0,'f',8).arg(_currLon,0,'f',8).arg(mapWinDotSize).arg(mapWinDotColor);
-  _webView->page()->runJavaScript(QString("gotoLocation( %1 )").arg(location));
+  _webView->page()->runJavaScript(QString("initialize( %1 )").arg(location));
 }
 

trunk/BNC/src/map/map_osm.html

@@ -18 +18 @@
       var markers;
       var marker;
-      var icon;  
+      var icon;
       var traceIcon;
       var fromProjection;
@@ -28 +28 @@
       function initialize(lat, lon, mapWinDotSize, mapWinDotColor) {
         dotSize = mapWinDotSize;
-        dotColor = mapWinDotColor;
+            dotColor = mapWinDotColor;
 
         if (dotSize > 10) dotSize = 10;
@@ -38 +38 @@
         fromProjection = new OpenLayers.Projection("EPSG:4326");   // WGS 1984
         toProjection   = new OpenLayers.Projection("EPSG:900913"); // Spherical Mercator
-        zoom           = 0; 
+        zoom           = 0;
 
         map.addLayer(new OpenLayers.Layer.OSM());
@@ -48 +48 @@
 
         var sizeT   = new OpenLayers.Size(dotSize,dotSize);
-        var offsetT = new OpenLayers.Pixel(-sizeT.w/2, -13);
-        if (dotColor == 1) {
+            var offsetT = new OpenLayers.Pixel(-sizeT.w/2, -13);
+            if (dotColor == 1) {
           traceIcon   = new OpenLayers.Icon("qrc:///map/reddot.png", sizeT, offsetT);
-        }
-        if (dotColor == 2) {
+        }
+            if (dotColor == 2) {
           traceIcon   = new OpenLayers.Icon("qrc:///map/yellowdot.png", sizeT, offsetT);
-        }
+            }
 
         markers = new OpenLayers.Layer.Markers("Markers");
         marker  = new OpenLayers.Marker(position, icon);
         markers.addMarker(marker);
-        
+
         map.addLayer(markers);