From 402d35fefced5a5fd65f226b5f179a38cd73c314 Mon Sep 17 00:00:00 2001 From: Nicolas F Date: Fri, 12 Jul 2019 16:55:47 +0200 Subject: [PATCH] util.js: remove some obsolete stuff A few debug console.log statements got the axe too, because I felt like it. --- overviewer_core/data/js_src/util.js | 109 +--------------------------- 1 file changed, 1 insertion(+), 108 deletions(-) diff --git a/overviewer_core/data/js_src/util.js b/overviewer_core/data/js_src/util.js index 7e077a2..e8dae02 100644 --- a/overviewer_core/data/js_src/util.js +++ b/overviewer_core/data/js_src/util.js @@ -32,9 +32,7 @@ overviewer.util = { * feature gets added. */ 'initialize': function() { - //overviewer.util.initializeClassPrototypes(); overviewer.util.initializePolyfills(); - overviewer.util.initializeMarkers(); overviewer.coordBoxClass = L.Control.extend({ options: { @@ -329,9 +327,7 @@ overviewer.util = { var tset = overviewerConfig.tilesets[0]; overviewer.map.on("click", function(e) { - console.log(e.latlng); var point = overviewer.util.fromLatLngToWorld(e.latlng.lat, e.latlng.lng, tset); - console.log(point); }); var tilesetLayers = {} @@ -387,7 +383,6 @@ overviewer.util = { var marker_entry = markers[obj.path][mkidx]; L.Util.setOptions(marker_group, {default_checked: marker_entry.checked}); var icon = L.divIcon({html: ``}); - console.log("marker group:", marker_entry.displayName, marker_entry.groupName); for (var dbidx = 0; dbidx < markersDB[marker_entry.groupName].raw.length; dbidx++) { var db = markersDB[marker_entry.groupName].raw[dbidx]; @@ -406,14 +401,6 @@ overviewer.util = { } obj.marker_groups[marker_entry.displayName] = marker_group; } - - - //var latlng = overviewer.util.fromWorldToLatLng( - // ovconf.spawn[0], - // ovconf.spawn[1], - // ovconf.spawn[2], - // obj); - //marker_group.addLayer(L.marker( } } @@ -452,18 +439,6 @@ overviewer.util = { var s = document.getElementsByTagName('script')[0]; s.parentNode.appendChild(m); }, - 'initializeMarkers': function() { - if (overviewer.collections.haveSigns=true) { - console.log("initializeMarkers"); - - - //Object.keys( - // - } - return; - - }, - /** Any polyfills needed to improve browser compatibility */ 'initializePolyfills': function() { @@ -479,44 +454,6 @@ overviewer.util = { }, - - /** - * This adds some methods to these classes because Javascript is stupid - * and this seems like the best way to avoid re-creating the same methods - * on each object at object creation time. - */ - 'initializeClassPrototypes': function() { - overviewer.classes.MapProjection.prototype.fromLatLngToPoint = function(latLng) { - var x = latLng.lng() * overviewerConfig.CONST.tileSize; - var y = latLng.lat() * overviewerConfig.CONST.tileSize; - return new google.maps.Point(x, y); - }; - - overviewer.classes.MapProjection.prototype.fromPointToLatLng = function(point) { - var lng = point.x * this.inverseTileSize; - var lat = point.y * this.inverseTileSize; - return new google.maps.LatLng(lat, lng); - }; - - overviewer.classes.CoordMapType.prototype.getTile = function(coord, zoom, ownerDocument) { - var div = ownerDocument.createElement('DIV'); - div.innerHTML = '(' + coord.x + ', ' + coord.y + ', ' + zoom + - ')' + '
'; - //TODO: figure out how to get the current mapType, I think this - //will add the maptile url to the grid thing once it works - - //div.innerHTML += overviewer.collections.mapTypes[0].getTileUrl(coord, zoom); - - //this should probably just have a css class - div.style.width = this.tileSize.width + 'px'; - div.style.height = this.tileSize.height + 'px'; - div.style.fontSize = '10px'; - div.style.borderStyle = 'solid'; - div.style.borderWidth = '1px'; - div.style.borderColor = '#AAAAAA'; - return div; - }; - }, /** * onready function for other scripts that rely on overviewer * usage: overviewer.util.ready(function(){ // do stuff }); @@ -601,7 +538,7 @@ overviewer.util = { * @param int y * @param TileSetModel model * - * @return google.maps.LatLng + * @return array */ 'fromWorldToLatLng': function(x, y, z, tset) { @@ -723,50 +660,6 @@ overviewer.util = { return point; }, - /** - * Create the pop-up infobox for when you click on a region, this can't - * be done in-line because of stupid Javascript scoping problems with - * closures or something. - * - * @param google.maps.Polygon|google.maps.Polyline shape - */ - 'createRegionInfoWindow': function(shape) { - var infowindow = new google.maps.InfoWindow(); - google.maps.event.addListener(shape, 'click', function(event, i) { - if (overviewer.collections.infoWindow) { - overviewer.collections.infoWindow.close(); - } - // Replace our Info Window's content and position - var point = overviewer.util.fromLatLngToWorld(event.latLng.lat(),event.latLng.lng()); - var contentString = 'Region: ' + shape.name + '
' + - 'Clicked Location:
' + Math.round(point.x,1) + ', ' + point.y - + ', ' + Math.round(point.z,1) - + '
'; - infowindow.setContent(contentString); - infowindow.setPosition(event.latLng); - infowindow.open(overviewer.map); - overviewer.collections.infoWindow = infowindow; - }); - }, - /** - * Same as createRegionInfoWindow() - * - * @param google.maps.Marker marker - */ - 'createMarkerInfoWindow': function(marker) { - var windowContent = '


' + marker.content.replace(/\n/g,'
') + '

'; - var infowindow = new google.maps.InfoWindow({ - 'content': windowContent - }); - google.maps.event.addListener(marker, 'click', function() { - if (overviewer.collections.infoWindow) { - overviewer.collections.infoWindow.close(); - } - infowindow.open(overviewer.map, marker); - overviewer.collections.infoWindow = infowindow; - }); - }, 'initHash': function() { var newHash = window.location.hash; if (overviewer.util.lastHash !== newHash) {