Merge branch 'release/1.5.0'

Author: mblomdahl

README.md

@@ -46,6 +46,7 @@ A `google.maps.Circle` replacement for Mapbox GL JS, rendering a "spherical cap"
 ```javascript
 var myCircle = new MapboxCircle({lat: 39.984, lng: -75.343}, 25000, {
         editable: true,
+        minRadius: 1500,
         fillColor: '#29AB87'
     }).addTo(myMapboxGlMap);
 
@@ -71,6 +72,8 @@ myCircle.on('contextmenu', function (mapMouseEvent) {
 -   `radius` **[number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)** Meter radius
 -   `options` **[Object](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Object)?** 
     -   `options.editable` **[boolean](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Boolean)?** Enable handles for changing center and radius (optional, default `false`)
+    -   `options.minRadius` **[number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Minimum radius on user interaction (optional, default `10`)
+    -   `options.maxRadius` **[number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Maximum radius on user interaction (optional, default `1100000`)
     -   `options.strokeColor` **[string](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String)?** Stroke color (optional, default `'#000000'`)
     -   `options.strokeWeight` **[number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Stroke weight (optional, default `0.5`)
     -   `options.strokeOpacity` **[number](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Number)?** Stroke opacity (optional, default `0.75`)
@@ -181,6 +184,10 @@ Returns **{sw: {lat: [number](https://developer.mozilla.org/en-US/docs/Web/JavaS
 
 ## Changelog
 
+### v. 1.5.0
+
+-   Added support for passing `minRadius` and `maxRadius` options to _MapboxCircle_ constructor
+
 ### v. 1.4.3
 
 -   Bug fix for handling _map.setStyle_ updates

example/index.js

@@ -61,6 +61,8 @@ const editableOpts = {
     strokeOpacity: 0.85,
     fillColor: '#29AB87',
     fillOpacity: 0.2,
+    minRadius: 100,
+    maxRadius: 500000,
     debugEl: document.body.appendChild(document.createElement('div'))
 };
 

index.html

@@ -140,6 +140,7 @@
 
     var editableCircleOpts = {
         editable: true,
+        minRadius: 50,
         debugEl: document.getElementById('debug')
     };
 

lib/main.js

@@ -21,6 +21,7 @@ if (window && typeof window.MapboxCircle === 'function') {
  * @example
  * var myCircle = new MapboxCircle({lat: 39.984, lng: -75.343}, 25000, {
  *         editable: true,
+ *         minRadius: 1500,
  *         fillColor: '#29AB87'
  *     }).addTo(myMapboxGlMap);
  *
@@ -126,7 +127,7 @@ class MapboxCircle {
 
     /** @param {number} newRadius Meter radius. */
     set radius(newRadius) {
-        this._currentRadius = Math.min(Math.max(this._minRadius, newRadius), this._maxRadius);
+        this._currentRadius = Math.min(Math.max(this.options.minRadius, newRadius), this.options.maxRadius);
         this._updateCircle();
         this._animate();
     }
@@ -150,6 +151,8 @@ class MapboxCircle {
      * @param {number} radius Meter radius
      * @param {?Object} options
      * @param {?boolean} [options.editable=false] Enable handles for changing center and radius
+     * @param {?number} [options.minRadius=10] Minimum radius on user interaction
+     * @param {?number} [options.maxRadius=1100000] Maximum radius on user interaction
      * @param {?string} [options.strokeColor='#000000'] Stroke color
      * @param {?number} [options.strokeWeight=0.5] Stroke weight
      * @param {?number} [options.strokeOpacity=0.75] Stroke opacity
@@ -170,8 +173,6 @@ class MapboxCircle {
 
         /** @const {[number,number]} */ this._lastCenterLngLat = [centerLng, centerLat];
         /** @const {[number,number]} */ this._currentCenterLngLat = [centerLng, centerLat];
-        /** @const {number} */ this._minRadius = 1e1;
-        /** @const {number} */ this._maxRadius = 1.1e6;
         /** @const {number} */ this._lastRadius = Math.round(radius);
         /** @const {number} */ this._currentRadius = Math.round(radius);
         /** @const {Object} */ this.options = _.extend({
@@ -182,6 +183,8 @@ class MapboxCircle {
             fillColor: '#FB6A4A',
             fillOpacity: 0.25,
             refineStroke: false,
+            minRadius: 10,
+            maxRadius: 1.1e6,
             properties: {},
             debugEl: null
         }, options);