ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2628 from fredj/scale-line

Browse Source 
Take the 'us' and 'nautical' units into account in scale line control
This commit is contained in:
Frédéric Junod
2014-08-26 11:03:48 +02:00
parent b83e639301 8c8fd64ecb
commit 1e0b366202
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/scale-line.html
+3 -1
View File
@@ -27,7 +27,9 @@
<div id="map" class="map"></div> <div id="map" class="map"></div>
<select id="units"> <select id="units">
<option value="degrees">degrees</option> <option value="degrees">degrees</option>
<option value="imperial">imperial</option> <option value="imperial">imperial inch</option>
<option value="us">us inch</option>
<option value="nautical">nautical mile</option>
<option value="metric">metric</option> <option value="metric">metric</option>
</select> </select>
</div> </div>
src/ol/control/scalelinecontrol.js
+6 -2
View File
@@ -213,7 +213,9 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
var units = this.getUnits(); var units = this.getUnits();
if (projectionUnits == ol.proj.Units.DEGREES && if (projectionUnits == ol.proj.Units.DEGREES &&
(units == ol.control.ScaleLineUnits.METRIC || (units == ol.control.ScaleLineUnits.METRIC ||
units == ol.control.ScaleLineUnits.IMPERIAL)) { units == ol.control.ScaleLineUnits.IMPERIAL ||
units == ol.control.ScaleLineUnits.US ||
units == ol.control.ScaleLineUnits.NAUTICAL)) {
// Convert pointResolution from degrees to meters // Convert pointResolution from degrees to meters
this.toEPSG4326_ = null; this.toEPSG4326_ = null;
@@ -244,7 +246,9 @@ ol.control.ScaleLine.prototype.updateElement_ = function() {
goog.asserts.assert( goog.asserts.assert(
((units == ol.control.ScaleLineUnits.METRIC || ((units == ol.control.ScaleLineUnits.METRIC ||
units == ol.control.ScaleLineUnits.IMPERIAL) && units == ol.control.ScaleLineUnits.IMPERIAL ||
units == ol.control.ScaleLineUnits.US ||
units == ol.control.ScaleLineUnits.NAUTICAL) &&
projectionUnits == ol.proj.Units.METERS) || projectionUnits == ol.proj.Units.METERS) ||
(units == ol.control.ScaleLineUnits.DEGREES && (units == ol.control.ScaleLineUnits.DEGREES &&
projectionUnits == ol.proj.Units.DEGREES)); projectionUnits == ol.proj.Units.DEGREES));