From 42fcb70347f59fce484cb6385d353586aa4aecc0 Mon Sep 17 00:00:00 2001 From: fredj Date: Mon, 16 Jan 2012 09:20:05 +0100 Subject: [PATCH] Coding standards: variable names to camel case --- lib/OpenLayers/Control/OverviewMap.js | 8 ++++---- lib/OpenLayers/Map.js | 25 ++++++++++++------------- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/lib/OpenLayers/Control/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js index 3b23300402..4c92522bb0 100644 --- a/lib/OpenLayers/Control/OverviewMap.js +++ b/lib/OpenLayers/Control/OverviewMap.js @@ -690,12 +690,12 @@ OpenLayers.Control.OverviewMap = OpenLayers.Class(OpenLayers.Control, { var res = this.ovmap.getResolution(); var center = this.ovmap.getExtent().getCenterLonLat(); - var delta_x = overviewMapPx.x - (size.w / 2); - var delta_y = overviewMapPx.y - (size.h / 2); + var deltaX = overviewMapPx.x - (size.w / 2); + var deltaY = overviewMapPx.y - (size.h / 2); return { - lon: center.lon + delta_x * res, - lat: center.lat - delta_y * res + lon: center.lon + deltaX * res, + lat: center.lat - deltaY * res }; }, diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index 05df48eaed..d440ce6a16 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -1471,14 +1471,13 @@ OpenLayers.Map = OpenLayers.Class({ } if ((center != null) && (resolution != null)) { - var half_w_deg = (this.size.w * resolution) / 2; - var half_h_deg = (this.size.h * resolution) / 2; - - extent = new OpenLayers.Bounds(center.lon - half_w_deg, - center.lat - half_h_deg, - center.lon + half_w_deg, - center.lat + half_h_deg); + var halfWDeg = (this.size.w * resolution) / 2; + var halfHDeg = (this.size.h * resolution) / 2; + extent = new OpenLayers.Bounds(center.lon - halfWDeg, + center.lat - halfHDeg, + center.lon + halfWDeg, + center.lat + halfHDeg); } return extent; @@ -2319,14 +2318,14 @@ OpenLayers.Map = OpenLayers.Class({ var res = OpenLayers.Util.getResolutionFromScale(scale, this.baseLayer.units); - var half_w_deg = (this.size.w * res) / 2; - var half_h_deg = (this.size.h * res) / 2; + var halfWDeg = (this.size.w * res) / 2; + var halfHDeg = (this.size.h * res) / 2; var center = this.getCachedCenter(); - var extent = new OpenLayers.Bounds(center.lon - half_w_deg, - center.lat - half_h_deg, - center.lon + half_w_deg, - center.lat + half_h_deg); + var extent = new OpenLayers.Bounds(center.lon - halfWDeg, + center.lat - halfHDeg, + center.lon + halfWDeg, + center.lat + halfHDeg); this.zoomToExtent(extent, closest); },