geojs 1.8.3 → 1.8.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "geojs",
-  "version": "1.8.3",
+  "version": "1.8.4",
   "description": "JavaScript Geo Visualization and Analysis Library",
   "homepage": "https://github.com/OpenGeoscience/geojs",
   "license": "Apache-2.0",

package/src/annotationLayer.js

@@ -706,14 +706,25 @@ var annotationLayer = function (arg) {
             return;
           }
           // make a copy of the position array to avoid mutating the original.
-          position = position.outer.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.length < 3) {
+          position = {
+            outer: position.outer.slice(),
+            inner: (position.inner || []).map((h) => h.slice())
+          };
+          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.outer.length < 3) {
               return;
             }
           }
+          position.inner.forEach((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':
           position = data.geometry.coordinates[0].slice(0, 4);
@@ -722,15 +733,20 @@ var annotationLayer = function (arg) {
           position = [feature.position()(data, data_idx)];
           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);
-      if (datagcs !== map.gcs()) {
-        position = transform.transformCoordinates(datagcs, map.gcs(), position);
-      }
+      [position.outer || position].concat(position.inner || []).forEach((poslist) => {
+        for (i = 0; i < poslist.length; i += 1) {
+          poslist[i] = util.normalizeCoordinates(poslist[i]);
+        }
+        if (datagcs !== map.gcs()) {
+          const 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

package/src/fetchQueue.js

@@ -40,6 +40,7 @@ var fetchQueue = function (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;
 
@@ -76,6 +77,30 @@ var fetchQueue = function (options) {
     }
   });
 
+  /**
+   * 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 () { return m_this._track; },
+    set: function (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 () { return m_this._initialTrack; },
+    set: function (n) { m_this._initialTrack = n; }
+  });
+
   /**
    * Get the current queue size.  Read only.
    * @property {number} length The current queue size.
@@ -157,7 +182,7 @@ var fetchQueue = function (options) {
     defer.__fetchQueue._batch = m_this._batch;
     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) {

package/src/tileLayer.js

@@ -16,7 +16,7 @@ var featureLayer = require('./featureLayer');
  * @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.
@@ -193,6 +193,10 @@ var tileLayer = function (arg) {
   arg = $.extend(true, {}, this.constructor.defaults, 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;
   }
   if ($.type(arg.subdomains) === 'string') {
@@ -261,6 +265,9 @@ var tileLayer = function (arg) {
   });
   this._queue._tileLayers = this._queue._tileLayers || [];
   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 = {};
 
@@ -310,10 +317,16 @@ var tileLayer = function (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;
+        }
       }
     }
   });
@@ -1736,6 +1749,9 @@ var tileLayer = function (arg) {
     m_exited = true;
     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;
   };
@@ -1765,7 +1781,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