geojs 1.8.3 → 1.8.4

package/CHANGELOG.md

@@ -1,5 +1,18 @@
 # GeoJS Change Log
 
+## Version 1.8.4
+
+### Improvements
+
+- Support polygon annotations with holes through geojson ([#1201](../../pull/1201))
+- Adjust queue track size based on number of tile layers ([#1202](../../pull/1202))
+
+## Version 1.8.3
+
+### Improvements
+
+- Support polygon annotations with holes ([#1200](../../pull/1200))
+
 ## Version 1.8.2
 
 ### Improvements

package/geo.js

@@ -4165,16 +4165,31 @@ var annotationLayer = function annotationLayer(arg) {
           } // make a copy of the position array to avoid mutating the original.
 
 
-          position = position.outer.slice();
+          position = {
+            outer: position.outer.slice(),
+            inner: (position.inner || []).map(function (h) {
+              return h.slice();
+            })
+          };
 
-          if (position[position.length - 1][0] === position[0][0] && position[position.length - 1][1] === position[0][1]) {
-            position.splice(position.length - 1, 1);
+          if (position.outer[position.outer.length - 1][0] === position.outer[0][0] && position.outer[position.outer.length - 1][1] === position.outer[0][1]) {
+            position.outer.splice(position.outer.length - 1, 1);
 
-            if (position.length < 3) {
+            if (position.outer.length < 3) {
               return;
             }
           }
 
+          position.inner.forEach(function (h) {
+            if (h.length > 3 && h[h.length - 1][0] === h[0][0] && h[h.length - 1][1] === h[0][1]) {
+              h.splice(h.length - 1, 1);
+            }
+          });
+
+          if (!position.inner || !position.inner.length) {
+            position = position.outer;
+          }
+
           break;
 
         case 'marker':
@@ -4186,16 +4201,20 @@ var annotationLayer = function annotationLayer(arg) {
           break;
       }
 
-      for (i = 0; i < position.length; i += 1) {
-        position[i] = util.normalizeCoordinates(position[i]);
-      }
-
       datagcs = data.crs && data.crs.type === 'name' && data.crs.properties && data.crs.properties.type === 'proj4' && data.crs.properties.name ? data.crs.properties.name : gcs;
+      [position.outer || position].concat(position.inner || []).forEach(function (poslist) {
+        for (i = 0; i < poslist.length; i += 1) {
+          poslist[i] = util.normalizeCoordinates(poslist[i]);
+        }
 
-      if (datagcs !== map.gcs()) {
-        position = transform.transformCoordinates(datagcs, map.gcs(), position);
-      }
+        if (datagcs !== map.gcs()) {
+          var transposlist = transform.transformCoordinates(datagcs, map.gcs(), poslist);
 
+          for (i = 0; i < poslist.length; i += 1) {
+            poslist[i] = transposlist[i];
+          }
+        }
+      });
       options.coordinates = position;
       /* For each style listed in the geojsonStyleProperties object, check if
        * is given under any of the variety of keys as a valid instance of the
@@ -10761,6 +10780,7 @@ var fetchQueue = function fetchQueue(options) {
   this._size = options.size || 6;
   this._initialSize = options.initialSize || 0;
   this._track = options.track || 600;
+  this._initialTrack = this._track;
   this._needed = options.needed || null;
   this._batch = false;
   var m_this = this,
@@ -10801,6 +10821,38 @@ var fetchQueue = function fetchQueue(options) {
       m_this.next_item();
     }
   });
+  /**
+   * Get/set the track size.  This is used to determine when to check if
+   * entries can be discarded.
+   * @property {number} track The number of entries to track without checking
+   *    for discards.
+   * @name geo.fetchQueue#track
+   */
+
+  Object.defineProperty(this, 'track', {
+    get: function get() {
+      return m_this._track;
+    },
+    set: function set(n) {
+      m_this._track = n;
+    }
+  });
+  /**
+   * Get/set the initial track size.  Unless changed, this is the value used
+   * for track on class initialization.
+   * @property {number} initialTrack The number of entries to track without
+   *    checking for discards.
+   * @name geo.fetchQueue#intitialTrack
+   */
+
+  Object.defineProperty(this, 'initialTrack', {
+    get: function get() {
+      return m_this._initialTrack;
+    },
+    set: function set(n) {
+      m_this._initialTrack = n;
+    }
+  });
   /**
    * Get the current queue size.  Read only.
    * @property {number} length The current queue size.
@@ -10897,7 +10949,7 @@ var fetchQueue = function fetchQueue(options) {
 
     if (atEnd) {
       m_this._queue.push(defer);
-    } else if (!this._batch) {
+    } else if (!m_this._batch) {
       m_this._queue.unshift(defer);
     } else {
       for (var i = 0; i < m_this._queue.length; i += 1) {
@@ -26804,7 +26856,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "06c78d577d1a9dd6332ee47b20fe441d239225ca";
+module.exports = "aa7a52c0facebedfe694ae91d1f9a295ade8765e";
 
 /***/ }),
 
@@ -29647,7 +29699,7 @@ var featureLayer = __webpack_require__(3715);
  * @property {function} [tilesAtZoom=null] A function that is given a zoom
  *   level and returns `{x: (num), y: (num)}` with the number of tiles at that
  *   zoom level.
- * @property {number} [cacheSize=400] The maximum number of tiles to cache.
+ * @property {number} [cacheSize=600] The maximum number of tiles to cache.
  *   The default is 200 if keepLower is false.
  * @property {geo.fetchQueue} [queue] A fetch queue to use.  If unspecified, a
  *   new queue is created.
@@ -29832,6 +29884,10 @@ var tileLayer = function tileLayer(arg) {
 
   if (!arg.cacheSize) {
     // this size should be sufficient for a 4k display
+    // where display size is (w, h), minimum tile dimension is ts, and total
+    // number of levels is ml, this is roughly
+    // sum([(math.ceil((w**2+h**2)**0.5 / (ts*2**l)) + 1) *
+    //      (math.ceil(min(w, h) / (ts*2**l)) + 1) for l in range(ml)])
     arg.cacheSize = arg.keepLower ? 600 : 200;
   }
 
@@ -29909,6 +29965,10 @@ var tileLayer = function tileLayer(arg) {
 
   this._queue._tileLayers.push(m_this);
 
+  if (this._queue.initialTrack && this._queue.track) {
+    this._queue.track = this._queue.initialTrack * this._queue._tileLayers.length;
+  }
+
   var m_tileOffsetValues = {};
   /**
    * Readonly accessor to the options object.
@@ -29965,12 +30025,20 @@ var tileLayer = function tileLayer(arg) {
       if (m_this._queue !== queue) {
         if (this._queue && this._queue._tileLayers && this._queue._tileLayers.indexOf(m_this) >= 0) {
           this._queue._tileLayers.splice(this._queue._tileLayers.indexOf(m_this), 1);
+
+          if (this._queue.initialTrack && this._queue.track && this._queue._tileLayers.length) {
+            this._queue.track = this._queue.initialTrack * this._queue._tileLayers.length;
+          }
         }
 
         m_this._queue = queue;
         m_this._queue._tileLayers = m_this._queue._tileLayers || [];
 
         m_this._queue._tileLayers.push(m_this);
+
+        if (m_this._queue.initialTrack && m_this._queue.track) {
+          m_this._queue.track = m_this._queue.initialTrack * m_this._queue._tileLayers.length;
+        }
       }
     }
   });
@@ -31579,6 +31647,10 @@ var tileLayer = function tileLayer(arg) {
 
     if (this._queue && this._queue._tileLayers && this._queue._tileLayers.indexOf(m_this) >= 0) {
       this._queue._tileLayers.splice(this._queue._tileLayers.indexOf(m_this), 1);
+
+      if (this._queue.initialTrack && this._queue.track && this._queue._tileLayers.length) {
+        this._queue.track = this._queue.initialTrack * this._queue._tileLayers.length;
+      }
     }
 
     return m_this;
@@ -31615,7 +31687,7 @@ tileLayer.defaults = {
   topDown: false,
   keepLower: true,
   idleAfter: 'view',
-  // cacheSize: 400,  // set depending on keepLower
+  // cacheSize: 600,  // set depending on keepLower
   tileRounding: Math.round,
   attribution: '',
   animationDuration: 0
@@ -39274,7 +39346,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.3";
+module.exports = "1.8.4";
 
 /***/ }),
 

package/geo.lean.js

@@ -4165,16 +4165,31 @@ var annotationLayer = function annotationLayer(arg) {
           } // make a copy of the position array to avoid mutating the original.
 
 
-          position = position.outer.slice();
+          position = {
+            outer: position.outer.slice(),
+            inner: (position.inner || []).map(function (h) {
+              return h.slice();
+            })
+          };
 
-          if (position[position.length - 1][0] === position[0][0] && position[position.length - 1][1] === position[0][1]) {
-            position.splice(position.length - 1, 1);
+          if (position.outer[position.outer.length - 1][0] === position.outer[0][0] && position.outer[position.outer.length - 1][1] === position.outer[0][1]) {
+            position.outer.splice(position.outer.length - 1, 1);
 
-            if (position.length < 3) {
+            if (position.outer.length < 3) {
               return;
             }
           }
 
+          position.inner.forEach(function (h) {
+            if (h.length > 3 && h[h.length - 1][0] === h[0][0] && h[h.length - 1][1] === h[0][1]) {
+              h.splice(h.length - 1, 1);
+            }
+          });
+
+          if (!position.inner || !position.inner.length) {
+            position = position.outer;
+          }
+
           break;
 
         case 'marker':
@@ -4186,16 +4201,20 @@ var annotationLayer = function annotationLayer(arg) {
           break;
       }
 
-      for (i = 0; i < position.length; i += 1) {
-        position[i] = util.normalizeCoordinates(position[i]);
-      }
-
       datagcs = data.crs && data.crs.type === 'name' && data.crs.properties && data.crs.properties.type === 'proj4' && data.crs.properties.name ? data.crs.properties.name : gcs;
+      [position.outer || position].concat(position.inner || []).forEach(function (poslist) {
+        for (i = 0; i < poslist.length; i += 1) {
+          poslist[i] = util.normalizeCoordinates(poslist[i]);
+        }
 
-      if (datagcs !== map.gcs()) {
-        position = transform.transformCoordinates(datagcs, map.gcs(), position);
-      }
+        if (datagcs !== map.gcs()) {
+          var transposlist = transform.transformCoordinates(datagcs, map.gcs(), poslist);
 
+          for (i = 0; i < poslist.length; i += 1) {
+            poslist[i] = transposlist[i];
+          }
+        }
+      });
       options.coordinates = position;
       /* For each style listed in the geojsonStyleProperties object, check if
        * is given under any of the variety of keys as a valid instance of the
@@ -10761,6 +10780,7 @@ var fetchQueue = function fetchQueue(options) {
   this._size = options.size || 6;
   this._initialSize = options.initialSize || 0;
   this._track = options.track || 600;
+  this._initialTrack = this._track;
   this._needed = options.needed || null;
   this._batch = false;
   var m_this = this,
@@ -10801,6 +10821,38 @@ var fetchQueue = function fetchQueue(options) {
       m_this.next_item();
     }
   });
+  /**
+   * Get/set the track size.  This is used to determine when to check if
+   * entries can be discarded.
+   * @property {number} track The number of entries to track without checking
+   *    for discards.
+   * @name geo.fetchQueue#track
+   */
+
+  Object.defineProperty(this, 'track', {
+    get: function get() {
+      return m_this._track;
+    },
+    set: function set(n) {
+      m_this._track = n;
+    }
+  });
+  /**
+   * Get/set the initial track size.  Unless changed, this is the value used
+   * for track on class initialization.
+   * @property {number} initialTrack The number of entries to track without
+   *    checking for discards.
+   * @name geo.fetchQueue#intitialTrack
+   */
+
+  Object.defineProperty(this, 'initialTrack', {
+    get: function get() {
+      return m_this._initialTrack;
+    },
+    set: function set(n) {
+      m_this._initialTrack = n;
+    }
+  });
   /**
    * Get the current queue size.  Read only.
    * @property {number} length The current queue size.
@@ -10897,7 +10949,7 @@ var fetchQueue = function fetchQueue(options) {
 
     if (atEnd) {
       m_this._queue.push(defer);
-    } else if (!this._batch) {
+    } else if (!m_this._batch) {
       m_this._queue.unshift(defer);
     } else {
       for (var i = 0; i < m_this._queue.length; i += 1) {
@@ -26804,7 +26856,7 @@ module.exports = sceneObject;
  * @constant
  * @type {string}
  */
-module.exports = "06c78d577d1a9dd6332ee47b20fe441d239225ca";
+module.exports = "aa7a52c0facebedfe694ae91d1f9a295ade8765e";
 
 /***/ }),
 
@@ -29647,7 +29699,7 @@ var featureLayer = __webpack_require__(3715);
  * @property {function} [tilesAtZoom=null] A function that is given a zoom
  *   level and returns `{x: (num), y: (num)}` with the number of tiles at that
  *   zoom level.
- * @property {number} [cacheSize=400] The maximum number of tiles to cache.
+ * @property {number} [cacheSize=600] The maximum number of tiles to cache.
  *   The default is 200 if keepLower is false.
  * @property {geo.fetchQueue} [queue] A fetch queue to use.  If unspecified, a
  *   new queue is created.
@@ -29832,6 +29884,10 @@ var tileLayer = function tileLayer(arg) {
 
   if (!arg.cacheSize) {
     // this size should be sufficient for a 4k display
+    // where display size is (w, h), minimum tile dimension is ts, and total
+    // number of levels is ml, this is roughly
+    // sum([(math.ceil((w**2+h**2)**0.5 / (ts*2**l)) + 1) *
+    //      (math.ceil(min(w, h) / (ts*2**l)) + 1) for l in range(ml)])
     arg.cacheSize = arg.keepLower ? 600 : 200;
   }
 
@@ -29909,6 +29965,10 @@ var tileLayer = function tileLayer(arg) {
 
   this._queue._tileLayers.push(m_this);
 
+  if (this._queue.initialTrack && this._queue.track) {
+    this._queue.track = this._queue.initialTrack * this._queue._tileLayers.length;
+  }
+
   var m_tileOffsetValues = {};
   /**
    * Readonly accessor to the options object.
@@ -29965,12 +30025,20 @@ var tileLayer = function tileLayer(arg) {
       if (m_this._queue !== queue) {
         if (this._queue && this._queue._tileLayers && this._queue._tileLayers.indexOf(m_this) >= 0) {
           this._queue._tileLayers.splice(this._queue._tileLayers.indexOf(m_this), 1);
+
+          if (this._queue.initialTrack && this._queue.track && this._queue._tileLayers.length) {
+            this._queue.track = this._queue.initialTrack * this._queue._tileLayers.length;
+          }
         }
 
         m_this._queue = queue;
         m_this._queue._tileLayers = m_this._queue._tileLayers || [];
 
         m_this._queue._tileLayers.push(m_this);
+
+        if (m_this._queue.initialTrack && m_this._queue.track) {
+          m_this._queue.track = m_this._queue.initialTrack * m_this._queue._tileLayers.length;
+        }
       }
     }
   });
@@ -31579,6 +31647,10 @@ var tileLayer = function tileLayer(arg) {
 
     if (this._queue && this._queue._tileLayers && this._queue._tileLayers.indexOf(m_this) >= 0) {
       this._queue._tileLayers.splice(this._queue._tileLayers.indexOf(m_this), 1);
+
+      if (this._queue.initialTrack && this._queue.track && this._queue._tileLayers.length) {
+        this._queue.track = this._queue.initialTrack * this._queue._tileLayers.length;
+      }
     }
 
     return m_this;
@@ -31615,7 +31687,7 @@ tileLayer.defaults = {
   topDown: false,
   keepLower: true,
   idleAfter: 'view',
-  // cacheSize: 400,  // set depending on keepLower
+  // cacheSize: 600,  // set depending on keepLower
   tileRounding: Math.round,
   attribution: '',
   animationDuration: 0
@@ -39274,7 +39346,7 @@ module.exports = vectorFeature;
  * @constant
  * @type {string}
  */
-module.exports = "1.8.3";
+module.exports = "1.8.4";
 
 /***/ }),