Index: trunk/BNC/src/bnc.qrc
===================================================================
--- trunk/BNC/src/bnc.qrc	(revision 5170)
+++ trunk/BNC/src/bnc.qrc	(revision 5171)
@@ -43,6 +43,5 @@
 <qresource>
     <file>map/html/index.html</file>
-    <file>map/html/init.js</file>
-    <file>map/html/tools.js</file>
+    <file>map/html/mapview.js</file>
 </qresource>
 </RCC>
Index: trunk/BNC/src/map/html/index.html
===================================================================
--- trunk/BNC/src/map/html/index.html	(revision 5170)
+++ trunk/BNC/src/map/html/index.html	(revision 5171)
@@ -11,6 +11,5 @@
     </style>
 
-    <script type="text/javascript" src="qrc:///map/html/init.js"></script>
-    <script type="text/javascript" src="qrc:///map/html/tools.js"></script>
+    <script type="text/javascript" src="qrc:///map/html/mapview.js"></script>
 
     <script type="text/javascript"
Index: trunk/BNC/src/map/html/init.js
===================================================================
--- trunk/BNC/src/map/html/init.js	(revision 5170)
+++ 	(revision )
@@ -1,17 +1,0 @@
-var map;
-var markers= [];
-var QtPlaces;
-
-var searchCircle;
-
-function initialize(x, y)
-{
-    var myOptions = {
-        center: new google.maps.LatLng(x, y),
-        zoom: 17,
-        mapTypeId: google.maps.MapTypeId.SATELLITE,
-        panControl: true
-    };
-    map = new google.maps.Map(document.getElementById("map_canvas"), myOptions)
-    //google.maps.event.addListener(map, "click", function() {} )
-}
Index: trunk/BNC/src/map/html/mapview.js
===================================================================
--- trunk/BNC/src/map/html/mapview.js	(revision 5171)
+++ trunk/BNC/src/map/html/mapview.js	(revision 5171)
@@ -0,0 +1,71 @@
+var map;
+var markers= [];
+var QtPlaces;
+
+var searchCircle;
+
+function initialize(x, y)
+{
+    var myOptions = {
+        center: new google.maps.LatLng(x, y),
+        zoom: 17,
+        mapTypeId: google.maps.MapTypeId.SATELLITE,
+        panControl: true
+    };
+    map = new google.maps.Map(document.getElementById("map_canvas"), myOptions)
+    //google.maps.event.addListener(map, "click", function() {} )
+}
+
+function getCurrentPointOfView() {
+    return map.getBounds().getCenter().toUrlValue(6);
+}
+
+function removeMarkers()
+{
+    while(markers.length)
+        markers.pop().setMap(null)
+}
+
+// function appendMarker(jsonObj)
+// {
+//     var marker = new google.maps.Marker({
+//         position: new google.maps.LatLng( jsonObj.geometry.location.lat, jsonObj.geometry.location.lng ),
+//         map: map,
+//         title: jsonObj.name,
+//         animation: google.maps.Animation.DROP,
+//         icon: jsonObj.icon
+//     });
+// 
+//     google.maps.event.addListener(marker, 'click', function() {
+//         QtPlaces.markerClicked( jsonObj['reference'] )
+//     });
+// 
+//     markers.push(marker)
+// }
+// 
+// function gotoPlace(json, zoom)
+// {
+//     map.setCenter( new google.maps.LatLng( json.geometry.location.lat, json.geometry.location.lng ) )
+//     map.setZoom(zoom)
+// }
+
+function gotoLocation( lat, lng, zoom )
+{
+    map.setCenter( new google.maps.LatLng( lat, lng ) )
+    map.setZoom(zoom)
+}
+
+function recreateSearchCircle(lat, lng, radius)
+{
+    var searchCircleOptions = {
+      strokeColor: "#000000",
+      strokeOpacity: 0.75,
+      strokeWeight: 1,
+      fillColor: "#000000",
+      fillOpacity: 0.35,
+      map: map,
+      center: new google.maps.LatLng( lat, lng ),
+      radius: radius
+    };
+    searchCircle = new google.maps.Circle(searchCircleOptions);
+}
Index: trunk/BNC/src/map/html/tools.js
===================================================================
--- trunk/BNC/src/map/html/tools.js	(revision 5170)
+++ 	(revision )
@@ -1,53 +1,0 @@
-function getCurrentPointOfView() {
-    return map.getBounds().getCenter().toUrlValue(6);
-}
-
-function removeMarkers()
-{
-    while(markers.length)
-        markers.pop().setMap(null)
-}
-
-// function appendMarker(jsonObj)
-// {
-//     var marker = new google.maps.Marker({
-//         position: new google.maps.LatLng( jsonObj.geometry.location.lat, jsonObj.geometry.location.lng ),
-//         map: map,
-//         title: jsonObj.name,
-//         animation: google.maps.Animation.DROP,
-//         icon: jsonObj.icon
-//     });
-// 
-//     google.maps.event.addListener(marker, 'click', function() {
-//         QtPlaces.markerClicked( jsonObj['reference'] )
-//     });
-// 
-//     markers.push(marker)
-// }
-// 
-// function gotoPlace(json, zoom)
-// {
-//     map.setCenter( new google.maps.LatLng( json.geometry.location.lat, json.geometry.location.lng ) )
-//     map.setZoom(zoom)
-// }
-
-function gotoLocation( lat, lng, zoom )
-{
-    map.setCenter( new google.maps.LatLng( lat, lng ) )
-    map.setZoom(zoom)
-}
-
-function recreateSearchCircle(lat, lng, radius)
-{
-    var searchCircleOptions = {
-      strokeColor: "#000000",
-      strokeOpacity: 0.75,
-      strokeWeight: 1,
-      fillColor: "#000000",
-      fillOpacity: 0.35,
-      map: map,
-      center: new google.maps.LatLng( lat, lng ),
-      radius: radius
-    };
-    searchCircle = new google.maps.Circle(searchCircleOptions);
-}
Index: trunk/BNC/src/src.pri
===================================================================
--- trunk/BNC/src/src.pri	(revision 5170)
+++ trunk/BNC/src/src.pri	(revision 5171)
@@ -134,3 +134,3 @@
 }  
 
-OTHER_FILES += map/html/index.html map/html/init.js map/html/tools.js
+OTHER_FILES += map/html/index.html map/html/mapview.js