geojs 1.6.4 → 1.6.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # GeoJS Change Log
 
+## Version 1.6.5
+
+### Bug Fixes
+
+- Fix spelling of collinear ([#1173](../../pull/1173))
+
 ## Version 1.6.4
 
 ### Bug Fixes
@@ -379,7 +385,7 @@
 - Added an `object.geoIsOn` function to check if an event is bound ([#768](../../pull/768))
 - Use the average perimeter for the center of a polygon or line ([#761](../../pull/761))
 - Allow display to/from gcs conversion functions to handle arrays of points ([#766](../../pull/766))
-- When drawing a line annotation, don't create intermediate colinear points ([#759](../../pull/759))
+- When drawing a line annotation, don't create intermediate collinear points ([#759](../../pull/759))
 - Improve exiting and reloading maps ([#750](../../pull/750))
 - Various minor improvements ([#767](../../pull/767), [#760](../../pull/760))
 

package/geo.js

@@ -1365,7 +1365,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
   }
 
   var cpp = layer.options('continuousPointProximity');
-  var cpc = layer.options('continuousPointColinearity');
+  var cpc = layer.options('continuousPointCollinearity');
   var ccp = layer.options('continuousCloseProximity');
 
   if (cpp || cpp === 0) {
@@ -1381,7 +1381,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
     var dist = layer.displayDistance(vertices[vertices.length - 2], null, evt.mouse.map, 'display');
 
     if (dist && dist > cpp) {
-      // combine nearly colinear points
+      // combine nearly collinear points
       if (vertices.length >= (m_this._lastClickVertexCount || 1) + 3) {
         var d01 = layer.displayDistance(vertices[vertices.length - 3], null, vertices[vertices.length - 2], null),
             d12 = dist,
@@ -2899,9 +2899,9 @@ var textFeature = __webpack_require__(9757);
  * @property {number} [continuousPointProximity=5] The minimum distance in
  *   display coordinates (pixels) between two adjacent points when dragging
  *   to create an annotation.  `false` disables continuous drawing mode.
- * @property {number} [continuousPointColinearity=1.0deg] The minimum angle
+ * @property {number} [continuousPointCollinearity=1.0deg] The minimum angle
  *   between a series of three points when dragging to not interpret them as
- *   colinear.  Only applies if `continuousPointProximity` is not `false`.
+ *   collinear.  Only applies if `continuousPointProximity` is not `false`.
  * @property {number} [continuousCloseProximity=10] The minimum distance in
  *   display coordinates (pixels) to close a polygon or end drawing a line when
  *   dragging to create an annotation.  `false` never closes at the end of a
@@ -3053,8 +3053,8 @@ var annotationLayer = function annotationLayer(arg) {
     // continuous drawing modes.
     continuousPointProximity: 5,
     // in radians, minimum angle between continuous points to interpret them as
-    // being coliner
-    continuousPointColinearity: 1.0 * Math.PI / 180,
+    // being collinear
+    continuousPointCollinearity: 1.0 * Math.PI / 180,
     continuousCloseProximity: 10,
     // in pixels, 0 is exact
     finalPointProximity: 10,
@@ -14626,9 +14626,9 @@ var lineFeature = function lineFeature(arg) {
    *
    * @param {array} data A new data array.
    * @param {number} [tolerance] The maximum variation allowed in map.gcs
-   *    units.  A value of zero will only remove perfectly colinear points.  If
-   *    not specified, this is set to a half display pixel at the map's current
-   *    zoom level.
+   *    units.  A value of zero will only remove perfectly collinear points.
+   *    If not specified, this is set to a half display pixel at the map's
+   *    current zoom level.
    * @param {function} [posFunc=this.style.get('position')] The function to
    *    get the position of each vertex.
    * @param {function} [lineFunc=this.style.get('line')] The function to get
@@ -23916,9 +23916,9 @@ var polygonFeature = function polygonFeature(arg) {
    *
    * @param {array} data A new data array.
    * @param {number} [tolerance] The maximum variation allowed in map.gcs
-   *    units.  A value of zero will only remove perfectly colinear points.  If
-   *    not specified, this is set to a half display pixel at the map's current
-   *    zoom level.
+   *    units.  A value of zero will only remove perfectly collinear points.
+   *    If not specified, this is set to a half display pixel at the map's
+   *    current zoom level.
    * @param {function} [posFunc=this.style.get('position')] The function to
    *    get the position of each vertex.
    * @param {function} [polyFunc=this.style.get('polygon')] The function to
@@ -26017,7 +26017,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "6670a9640d46540bbf80aaa643d96617642bd23d";
+module.exports = "07bea0c1a0c68aece32ca33afaeed257361803e3";
 
 /***/ }),
 
@@ -36750,7 +36750,7 @@ var util = {
   /**
    * Determine if two line segments cross.  They are not considered crossing if
    * they share a vertex.  They are crossing if either of one segment's
-   * vertices are colinear with the other segment.
+   * vertices are collinear with the other segment.
    *
    * @param {geo.geoPosition} seg1pt1 One endpoint of the first segment.
    * @param {geo.geoPosition} seg1pt2 The other endpoint of the first segment.
@@ -36772,7 +36772,7 @@ var util = {
     }
     /* If the lines cross, the signed area of the triangles formed between one
      * segment and the other's vertices will have different signs.  By using
-     * > 0, colinear points are crossing. */
+     * > 0, collinear points are crossing. */
 
 
     if (util.triangleTwiceSignedArea2d(seg1pt1, seg1pt2, seg2pt1) * util.triangleTwiceSignedArea2d(seg1pt1, seg1pt2, seg2pt2) > 0 || util.triangleTwiceSignedArea2d(seg2pt1, seg2pt2, seg1pt1) * util.triangleTwiceSignedArea2d(seg2pt1, seg2pt2, seg1pt2) > 0) {
@@ -36819,7 +36819,7 @@ var util = {
    * @param {geo.geoPosition[]} pts A list of points forming the line or
    *    polygon.
    * @param {number} tolerance The maximum variation allowed.  A value of zero
-   *    will only remove perfectly colinear points.
+   *    will only remove perfectly collinear points.
    * @param {boolean} [closed] If true, this is a polygon rather than an open
    *    line.  In this case, it is possible to get back a single point.
    * @param {Array.<geo.geoPosition[]>?} [noCrossLines] A falsy value to allow
@@ -38481,7 +38481,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.6.4";
+module.exports = "1.6.5";
 
 /***/ }),
 

package/geo.lean.js

@@ -1365,7 +1365,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
   }
 
   var cpp = layer.options('continuousPointProximity');
-  var cpc = layer.options('continuousPointColinearity');
+  var cpc = layer.options('continuousPointCollinearity');
   var ccp = layer.options('continuousCloseProximity');
 
   if (cpp || cpp === 0) {
@@ -1381,7 +1381,7 @@ function continuousVerticesProcessAction(m_this, evt, name) {
     var dist = layer.displayDistance(vertices[vertices.length - 2], null, evt.mouse.map, 'display');
 
     if (dist && dist > cpp) {
-      // combine nearly colinear points
+      // combine nearly collinear points
       if (vertices.length >= (m_this._lastClickVertexCount || 1) + 3) {
         var d01 = layer.displayDistance(vertices[vertices.length - 3], null, vertices[vertices.length - 2], null),
             d12 = dist,
@@ -2899,9 +2899,9 @@ var textFeature = __webpack_require__(9757);
  * @property {number} [continuousPointProximity=5] The minimum distance in
  *   display coordinates (pixels) between two adjacent points when dragging
  *   to create an annotation.  `false` disables continuous drawing mode.
- * @property {number} [continuousPointColinearity=1.0deg] The minimum angle
+ * @property {number} [continuousPointCollinearity=1.0deg] The minimum angle
  *   between a series of three points when dragging to not interpret them as
- *   colinear.  Only applies if `continuousPointProximity` is not `false`.
+ *   collinear.  Only applies if `continuousPointProximity` is not `false`.
  * @property {number} [continuousCloseProximity=10] The minimum distance in
  *   display coordinates (pixels) to close a polygon or end drawing a line when
  *   dragging to create an annotation.  `false` never closes at the end of a
@@ -3053,8 +3053,8 @@ var annotationLayer = function annotationLayer(arg) {
     // continuous drawing modes.
     continuousPointProximity: 5,
     // in radians, minimum angle between continuous points to interpret them as
-    // being coliner
-    continuousPointColinearity: 1.0 * Math.PI / 180,
+    // being collinear
+    continuousPointCollinearity: 1.0 * Math.PI / 180,
     continuousCloseProximity: 10,
     // in pixels, 0 is exact
     finalPointProximity: 10,
@@ -14626,9 +14626,9 @@ var lineFeature = function lineFeature(arg) {
    *
    * @param {array} data A new data array.
    * @param {number} [tolerance] The maximum variation allowed in map.gcs
-   *    units.  A value of zero will only remove perfectly colinear points.  If
-   *    not specified, this is set to a half display pixel at the map's current
-   *    zoom level.
+   *    units.  A value of zero will only remove perfectly collinear points.
+   *    If not specified, this is set to a half display pixel at the map's
+   *    current zoom level.
    * @param {function} [posFunc=this.style.get('position')] The function to
    *    get the position of each vertex.
    * @param {function} [lineFunc=this.style.get('line')] The function to get
@@ -23916,9 +23916,9 @@ var polygonFeature = function polygonFeature(arg) {
    *
    * @param {array} data A new data array.
    * @param {number} [tolerance] The maximum variation allowed in map.gcs
-   *    units.  A value of zero will only remove perfectly colinear points.  If
-   *    not specified, this is set to a half display pixel at the map's current
-   *    zoom level.
+   *    units.  A value of zero will only remove perfectly collinear points.
+   *    If not specified, this is set to a half display pixel at the map's
+   *    current zoom level.
    * @param {function} [posFunc=this.style.get('position')] The function to
    *    get the position of each vertex.
    * @param {function} [polyFunc=this.style.get('polygon')] The function to
@@ -26017,7 +26017,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "6670a9640d46540bbf80aaa643d96617642bd23d";
+module.exports = "07bea0c1a0c68aece32ca33afaeed257361803e3";
 
 /***/ }),
 
@@ -36750,7 +36750,7 @@ var util = {
   /**
    * Determine if two line segments cross.  They are not considered crossing if
    * they share a vertex.  They are crossing if either of one segment's
-   * vertices are colinear with the other segment.
+   * vertices are collinear with the other segment.
    *
    * @param {geo.geoPosition} seg1pt1 One endpoint of the first segment.
    * @param {geo.geoPosition} seg1pt2 The other endpoint of the first segment.
@@ -36772,7 +36772,7 @@ var util = {
     }
     /* If the lines cross, the signed area of the triangles formed between one
      * segment and the other's vertices will have different signs.  By using
-     * > 0, colinear points are crossing. */
+     * > 0, collinear points are crossing. */
 
 
     if (util.triangleTwiceSignedArea2d(seg1pt1, seg1pt2, seg2pt1) * util.triangleTwiceSignedArea2d(seg1pt1, seg1pt2, seg2pt2) > 0 || util.triangleTwiceSignedArea2d(seg2pt1, seg2pt2, seg1pt1) * util.triangleTwiceSignedArea2d(seg2pt1, seg2pt2, seg1pt2) > 0) {
@@ -36819,7 +36819,7 @@ var util = {
    * @param {geo.geoPosition[]} pts A list of points forming the line or
    *    polygon.
    * @param {number} tolerance The maximum variation allowed.  A value of zero
-   *    will only remove perfectly colinear points.
+   *    will only remove perfectly collinear points.
    * @param {boolean} [closed] If true, this is a polygon rather than an open
    *    line.  In this case, it is possible to get back a single point.
    * @param {Array.<geo.geoPosition[]>?} [noCrossLines] A falsy value to allow
@@ -38481,7 +38481,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.6.4";
+module.exports = "1.6.5";
 
 /***/ }),