geojs 1.6.5 → 1.6.6

package/package.json

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

package/src/canvas/pixelmapFeature.js

@@ -1,6 +1,8 @@
 var inherit = require('../inherit');
 var registerFeature = require('../registry').registerFeature;
 var pixelmapFeature = require('../pixelmapFeature');
+var geo_event = require('../event');
+var util = require('../util');
 
 /**
  * Create a new instance of class pixelmapFeature.
@@ -22,6 +24,191 @@ var canvas_pixelmapFeature = function (arg) {
   var object = require('./object');
   object.call(this);
 
+  var m_quadFeature,
+      s_exit = this._exit,
+      m_this = this;
+
+  /**
+   * If the specified coordinates are in the rendered quad, use the basis
+   * information from the quad to determine the pixelmap index value so that it
+   * can be included in the `found` results.
+   *
+   * @param {geo.geoPosition} geo Coordinate.
+   * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
+   *    the interface gcs, `null` to use the map gcs, or any other transform.
+   * @returns {geo.feature.searchResult} An object with a list of features and
+   *    feature indices that are located at the specified point.
+   */
+  this.pointSearch = function (geo, gcs) {
+    if (m_quadFeature && m_this.m_info) {
+      var result = m_quadFeature.pointSearch(geo, gcs);
+      if (result.index.length === 1 && result.extra && result.extra[result.index[0]].basis) {
+        var basis = result.extra[result.index[0]].basis, x, y, idx;
+        x = Math.floor(basis.x * m_this.m_info.width);
+        y = Math.floor(basis.y * m_this.m_info.height);
+        if (x >= 0 && x < m_this.m_info.width &&
+            y >= 0 && y < m_this.m_info.height) {
+          idx = m_this.m_info.indices[y * m_this.m_info.width + x];
+          result = {
+            index: [idx],
+            found: [m_this.data()[idx]]
+          };
+          return result;
+        }
+      }
+    }
+    return {index: [], found: []};
+  };
+
+  /**
+   * Compute information for this pixelmap image.  It is wasteful to call this
+   * if the pixelmap has already been prepared (it is invalidated by a change
+   * in the image).
+   *
+   * @returns {geo.pixelmapFeature.info}
+   */
+  this._preparePixelmap = function () {
+    var i, idx, pixelData;
+
+    if (!util.isReadyImage(m_this.m_srcImage)) {
+      return;
+    }
+    m_this.m_info = {
+      width: m_this.m_srcImage.naturalWidth,
+      height: m_this.m_srcImage.naturalHeight,
+      canvas: document.createElement('canvas')
+    };
+
+    m_this.m_info.canvas.width = m_this.m_info.width;
+    m_this.m_info.canvas.height = m_this.m_info.height;
+    m_this.m_info.context = m_this.m_info.canvas.getContext('2d');
+
+    m_this.m_info.context.drawImage(m_this.m_srcImage, 0, 0);
+    m_this.m_info.imageData = m_this.m_info.context.getImageData(
+      0, 0, m_this.m_info.canvas.width, m_this.m_info.canvas.height);
+    pixelData = m_this.m_info.imageData.data;
+    m_this.m_info.indices = new Array(pixelData.length / 4);
+    m_this.m_info.area = pixelData.length / 4;
+
+    m_this.m_info.mappedColors = {};
+    for (i = 0; i < pixelData.length; i += 4) {
+      idx = pixelData[i] + (pixelData[i + 1] << 8) + (pixelData[i + 2] << 16);
+      m_this.m_info.indices[i / 4] = idx;
+      if (!m_this.m_info.mappedColors[idx]) {
+        m_this.m_info.mappedColors[idx] = {first: i / 4};
+      }
+      m_this.m_info.mappedColors[idx].last = i / 4;
+    }
+    return m_this.m_info;
+  };
+
+  /**
+   * Given the loaded pixelmap image, create a canvas the size of the image.
+   * Compute a color for each distinct index and recolor the canvas based on
+   * these colors, then draw the resultant image as a quad.
+   *
+   * @fires geo.event.pixelmap.prepared
+   */
+  this._computePixelmap = function () {
+    var data = m_this.data() || [],
+        colorFunc = m_this.style.get('color'),
+        i, idx, lastidx, color, pixelData, indices, mappedColors,
+        updateFirst, updateLast = -1, update, prepared;
+
+    if (!m_this.m_info) {
+      if (!m_this._preparePixelmap()) {
+        return;
+      }
+      prepared = true;
+    }
+    mappedColors = m_this.m_info.mappedColors;
+    updateFirst = m_this.m_info.area;
+    for (idx in mappedColors) {
+      if (mappedColors.hasOwnProperty(idx)) {
+        color = colorFunc(data[idx], +idx) || {};
+        color = [
+          (color.r || 0) * 255,
+          (color.g || 0) * 255,
+          (color.b || 0) * 255,
+          color.a === undefined ? 255 : (color.a * 255)
+        ];
+        mappedColors[idx].update = (
+          !mappedColors[idx].color ||
+          mappedColors[idx].color[0] !== color[0] ||
+          mappedColors[idx].color[1] !== color[1] ||
+          mappedColors[idx].color[2] !== color[2] ||
+          mappedColors[idx].color[3] !== color[3]);
+        if (mappedColors[idx].update) {
+          mappedColors[idx].color = color;
+          updateFirst = Math.min(mappedColors[idx].first, updateFirst);
+          updateLast = Math.max(mappedColors[idx].last, updateLast);
+        }
+      }
+    }
+    /* If nothing was updated, we are done */
+    if (updateFirst >= updateLast) {
+      return;
+    }
+    /* Update only the extent that has changed */
+    pixelData = m_this.m_info.imageData.data;
+    indices = m_this.m_info.indices;
+    for (i = updateFirst; i <= updateLast; i += 1) {
+      idx = indices[i];
+      if (idx !== lastidx) {
+        lastidx = idx;
+        color = mappedColors[idx].color;
+        update = mappedColors[idx].update;
+      }
+      if (update) {
+        pixelData[i * 4] = color[0];
+        pixelData[i * 4 + 1] = color[1];
+        pixelData[i * 4 + 2] = color[2];
+        pixelData[i * 4 + 3] = color[3];
+      }
+    }
+    /* Place the updated area into the canvas */
+    m_this.m_info.context.putImageData(
+      m_this.m_info.imageData, 0, 0, 0, Math.floor(updateFirst / m_this.m_info.width),
+      m_this.m_info.width, Math.ceil((updateLast + 1) / m_this.m_info.width));
+
+    /* If we haven't made a quad feature, make one now.  The quad feature needs
+     * to have the canvas capability. */
+    if (!m_quadFeature) {
+      m_quadFeature = m_this.layer().createFeature('quad', {
+        selectionAPI: false,
+        gcs: m_this.gcs(),
+        visible: m_this.visible(undefined, true)
+      });
+      m_this.dependentFeatures([m_quadFeature]);
+      m_quadFeature.style({
+        image: m_this.m_info.canvas,
+        position: m_this.style.get('position')})
+      .data([{}])
+      .draw();
+    }
+    /* If we prepared the pixelmap and rendered it, send a prepared event */
+    if (prepared) {
+      m_this.geoTrigger(geo_event.pixelmap.prepared, {
+        pixelmap: m_this
+      });
+    }
+  };
+
+  /**
+   * Destroy.  Deletes the associated quadFeature.
+   *
+   * @returns {this}
+   */
+  this._exit = function () {
+    if (m_quadFeature && m_this.layer()) {
+      m_this.layer().deleteFeature(m_quadFeature);
+      m_quadFeature = null;
+      m_this.dependentFeatures([]);
+    }
+    s_exit();
+    return m_this;
+  };
+
   this._init(arg);
   return this;
 };

package/src/pixelmapFeature.js

@@ -1,7 +1,6 @@
 var $ = require('jquery');
 var inherit = require('./inherit');
 var feature = require('./feature');
-var geo_event = require('./event');
 var util = require('./util');
 
 /**
@@ -72,12 +71,8 @@ var pixelmapFeature = function (arg) {
    * @private
    */
   var m_this = this,
-      m_quadFeature,
-      m_srcImage,
-      m_info,
       s_update = this._update,
-      s_init = this._init,
-      s_exit = this._exit;
+      s_init = this._init;
 
   this.featureType = 'pixelmap';
 
@@ -113,7 +108,7 @@ var pixelmapFeature = function (arg) {
     if (val === undefined) {
       return m_this.style('url');
     } else if (val !== m_this.style('url')) {
-      m_srcImage = m_info = undefined;
+      m_this.m_srcImage = m_this.m_info = undefined;
       m_this.style('url', val);
       m_this.dataTime().modified();
       m_this.modified();
@@ -121,28 +116,6 @@ var pixelmapFeature = function (arg) {
     return m_this;
   };
 
-  /**
-   * Get the maximum index value from the pixelmap.  This is a value present in
-   * the pixelmap.
-   *
-   * @returns {number} The maximum index value.
-   */
-  this.maxIndex = function () {
-    if (m_info) {
-      /* This isn't just m_info.mappedColors.length - 1, since there
-       * may be more data than actual indices. */
-      if (m_info.maxIndex === undefined) {
-        m_info.maxIndex = 0;
-        for (var idx in m_info.mappedColors) {
-          if (m_info.mappedColors.hasOwnProperty(idx)) {
-            m_info.maxIndex = Math.max(m_info.maxIndex, idx);
-          }
-        }
-      }
-      return m_info.maxIndex;
-    }
-  };
-
   /**
    * Get/Set color accessor.
    *
@@ -162,35 +135,51 @@ var pixelmapFeature = function (arg) {
   };
 
   /**
-   * If the specified coordinates are in the rendered quad, use the basis
-   * information from the quad to determine the pixelmap index value so that it
-   * can be included in the `found` results.
+   * Update.
    *
-   * @param {geo.geoPosition} geo Coordinate.
-   * @param {string|geo.transform|null} [gcs] Input gcs.  `undefined` to use
-   *    the interface gcs, `null` to use the map gcs, or any other transform.
-   * @returns {geo.feature.searchResult} An object with a list of features and
-   *    feature indices that are located at the specified point.
+   * @returns {this}
    */
-  this.pointSearch = function (geo, gcs) {
-    if (m_quadFeature && m_info) {
-      var result = m_quadFeature.pointSearch(geo, gcs);
-      if (result.index.length === 1 && result.extra && result.extra[result.index[0]].basis) {
-        var basis = result.extra[result.index[0]].basis, x, y, idx;
-        x = Math.floor(basis.x * m_info.width);
-        y = Math.floor(basis.y * m_info.height);
-        if (x >= 0 && x < m_info.width &&
-            y >= 0 && y < m_info.height) {
-          idx = m_info.indices[y * m_info.width + x];
-          result = {
-            index: [idx],
-            found: [m_this.data()[idx]]
-          };
-          return result;
+  this._update = function () {
+    s_update.call(m_this);
+    if (m_this.buildTime().timestamp() <= m_this.dataTime().timestamp() ||
+        m_this.updateTime().timestamp() < m_this.timestamp()) {
+      m_this._build();
+    }
+
+    m_this.updateTime().modified();
+    return m_this;
+  };
+
+  /**
+   * Get the maximum index value from the pixelmap.  This is a value present in
+   * the pixelmap.
+   *
+   * @returns {number} The maximum index value.
+   */
+  this.maxIndex = function () {
+    if (m_this.m_info) {
+      /* This isn't just m_info.mappedColors.length - 1, since there
+       * may be more data than actual indices. */
+      if (m_this.m_info.maxIndex === undefined) {
+        m_this.m_info.maxIndex = 0;
+        for (var idx in m_this.m_info.mappedColors) {
+          if (m_this.m_info.mappedColors.hasOwnProperty(idx)) {
+            m_this.m_info.maxIndex = Math.max(m_this.m_info.maxIndex, idx);
+          }
         }
       }
+      return m_this.m_info.maxIndex;
     }
-    return {index: [], found: []};
+  };
+
+  /**
+   * Given the loaded pixelmap image, create a canvas the size of the image.
+   * Compute a color for each distinct index and recolor the canvas based on
+   * these colors, then draw the resultant image as a quad.
+   *
+   * @fires geo.event.pixelmap.prepared
+   */
+  this._computePixelmap = function () {
   };
 
   /**
@@ -204,42 +193,42 @@ var pixelmapFeature = function (arg) {
      * checks if this feature is built.  Setting the build time avoids calling
      * this a second time. */
     m_this.buildTime().modified();
-    if (!m_srcImage) {
+    if (!m_this.m_srcImage) {
       var src = m_this.style.get('url')();
       if (util.isReadyImage(src)) {
         /* we have an already loaded image, so we can just use it. */
-        m_srcImage = src;
+        m_this.m_srcImage = src;
         m_this._computePixelmap();
       } else if (src) {
         var defer = $.Deferred(), prev_onload, prev_onerror;
         if (src instanceof Image) {
           /* we have an unloaded image.  Hook to the load and error callbacks
            * so that when it is loaded we can use it. */
-          m_srcImage = src;
+          m_this.m_srcImage = src;
           prev_onload = src.onload;
           prev_onerror = src.onerror;
         } else {
           /* we were given a url, so construct a new image */
-          m_srcImage = new Image();
+          m_this.m_srcImage = new Image();
           // Only set the crossOrigin parameter if this is going across origins.
           if (src.indexOf(':') >= 0 &&
               src.indexOf('/') === src.indexOf(':') + 1) {
-            m_srcImage.crossOrigin = m_this.style.get('crossDomain')() || 'anonymous';
+            m_this.m_srcImage.crossOrigin = m_this.style.get('crossDomain')() || 'anonymous';
           }
         }
-        m_srcImage.onload = function () {
+        m_this.m_srcImage.onload = function () {
           if (prev_onload) {
             prev_onload.apply(m_this, arguments);
           }
           /* Only use this image if our pixelmap hasn't changed since we
            * attached our handler */
           if (m_this.style.get('url')() === src) {
-            m_info = undefined;
+            m_this.m_info = undefined;
             m_this._computePixelmap();
           }
           defer.resolve();
         };
-        m_srcImage.onerror = function () {
+        m_this.m_srcImage.onerror = function () {
           if (prev_onerror) {
             prev_onerror.apply(m_this, arguments);
           }
@@ -248,180 +237,15 @@ var pixelmapFeature = function (arg) {
         defer.promise(m_this);
         m_this.layer().addPromise(m_this);
         if (!(src instanceof Image)) {
-          m_srcImage.src = src;
+          m_this.m_srcImage.src = src;
         }
       }
-    } else if (m_info) {
+    } else if (m_this.m_info) {
       m_this._computePixelmap();
     }
     return m_this;
   };
 
-  /**
-   * Compute information for this pixelmap image.  It is wasteful to call this
-   * if the pixelmap has already been prepared (it is invalidated by a change
-   * in the image).
-   *
-   * @returns {geo.pixelmapFeature.info}
-   */
-  this._preparePixelmap = function () {
-    var i, idx, pixelData;
-
-    if (!util.isReadyImage(m_srcImage)) {
-      return;
-    }
-    m_info = {
-      width: m_srcImage.naturalWidth,
-      height: m_srcImage.naturalHeight,
-      canvas: document.createElement('canvas')
-    };
-
-    m_info.canvas.width = m_info.width;
-    m_info.canvas.height = m_info.height;
-    m_info.context = m_info.canvas.getContext('2d');
-
-    m_info.context.drawImage(m_srcImage, 0, 0);
-    m_info.imageData = m_info.context.getImageData(
-      0, 0, m_info.canvas.width, m_info.canvas.height);
-    pixelData = m_info.imageData.data;
-    m_info.indices = new Array(pixelData.length / 4);
-    m_info.area = pixelData.length / 4;
-
-    m_info.mappedColors = {};
-    for (i = 0; i < pixelData.length; i += 4) {
-      idx = pixelData[i] + (pixelData[i + 1] << 8) + (pixelData[i + 2] << 16);
-      m_info.indices[i / 4] = idx;
-      if (!m_info.mappedColors[idx]) {
-        m_info.mappedColors[idx] = {first: i / 4};
-      }
-      m_info.mappedColors[idx].last = i / 4;
-    }
-    return m_info;
-  };
-
-  /**
-   * Given the loaded pixelmap image, create a canvas the size of the image.
-   * Compute a color for each distinct index and recolor the canvas based on
-   * these colors, then draw the resultant image as a quad.
-   *
-   * @fires geo.event.pixelmap.prepared
-   */
-  this._computePixelmap = function () {
-    var data = m_this.data() || [],
-        colorFunc = m_this.style.get('color'),
-        i, idx, lastidx, color, pixelData, indices, mappedColors,
-        updateFirst, updateLast = -1, update, prepared;
-
-    if (!m_info) {
-      if (!m_this._preparePixelmap()) {
-        return;
-      }
-      prepared = true;
-    }
-    mappedColors = m_info.mappedColors;
-    updateFirst = m_info.area;
-    for (idx in mappedColors) {
-      if (mappedColors.hasOwnProperty(idx)) {
-        color = colorFunc(data[idx], +idx) || {};
-        color = [
-          (color.r || 0) * 255,
-          (color.g || 0) * 255,
-          (color.b || 0) * 255,
-          color.a === undefined ? 255 : (color.a * 255)
-        ];
-        mappedColors[idx].update = (
-          !mappedColors[idx].color ||
-          mappedColors[idx].color[0] !== color[0] ||
-          mappedColors[idx].color[1] !== color[1] ||
-          mappedColors[idx].color[2] !== color[2] ||
-          mappedColors[idx].color[3] !== color[3]);
-        if (mappedColors[idx].update) {
-          mappedColors[idx].color = color;
-          updateFirst = Math.min(mappedColors[idx].first, updateFirst);
-          updateLast = Math.max(mappedColors[idx].last, updateLast);
-        }
-      }
-    }
-    /* If nothing was updated, we are done */
-    if (updateFirst >= updateLast) {
-      return;
-    }
-    /* Update only the extent that has changed */
-    pixelData = m_info.imageData.data;
-    indices = m_info.indices;
-    for (i = updateFirst; i <= updateLast; i += 1) {
-      idx = indices[i];
-      if (idx !== lastidx) {
-        lastidx = idx;
-        color = mappedColors[idx].color;
-        update = mappedColors[idx].update;
-      }
-      if (update) {
-        pixelData[i * 4] = color[0];
-        pixelData[i * 4 + 1] = color[1];
-        pixelData[i * 4 + 2] = color[2];
-        pixelData[i * 4 + 3] = color[3];
-      }
-    }
-    /* Place the updated area into the canvas */
-    m_info.context.putImageData(
-      m_info.imageData, 0, 0, 0, Math.floor(updateFirst / m_info.width),
-      m_info.width, Math.ceil((updateLast + 1) / m_info.width));
-
-    /* If we haven't made a quad feature, make one now.  The quad feature needs
-     * to have the canvas capability. */
-    if (!m_quadFeature) {
-      m_quadFeature = m_this.layer().createFeature('quad', {
-        selectionAPI: false,
-        gcs: m_this.gcs(),
-        visible: m_this.visible(undefined, true)
-      });
-      m_this.dependentFeatures([m_quadFeature]);
-      m_quadFeature.style({
-        image: m_info.canvas,
-        position: m_this.style.get('position')})
-      .data([{}])
-      .draw();
-    }
-    /* If we prepared the pixelmap and rendered it, send a prepared event */
-    if (prepared) {
-      m_this.geoTrigger(geo_event.pixelmap.prepared, {
-        pixelmap: m_this
-      });
-    }
-  };
-
-  /**
-   * Update.
-   *
-   * @returns {this}
-   */
-  this._update = function () {
-    s_update.call(m_this);
-    if (m_this.buildTime().timestamp() <= m_this.dataTime().timestamp() ||
-        m_this.updateTime().timestamp() < m_this.timestamp()) {
-      m_this._build();
-    }
-
-    m_this.updateTime().modified();
-    return m_this;
-  };
-
-  /**
-   * Destroy.  Deletes the associated quadFeature.
-   *
-   * @returns {this}
-   */
-  this._exit = function () {
-    if (m_quadFeature && m_this.layer()) {
-      m_this.layer().deleteFeature(m_quadFeature);
-      m_quadFeature = null;
-      m_this.dependentFeatures([]);
-    }
-    s_exit();
-    return m_this;
-  };
-
   /**
    * Initialize.
    *

package/src/quadFeature.js

@@ -232,7 +232,7 @@ var quadFeature = function (arg) {
             coordbasis.y = 1 - coordbasis.y;
           }
           if (coordbasis) {
-            extra[quad.idx] = {basis: coordbasis};
+            extra[quad.idx] = {basis: coordbasis, _quad: quad};
           }
         }
       });

package/src/webgl/index.js

@@ -8,8 +8,10 @@ module.exports = {
   isolineFeature: require('./isolineFeature'),
   layer: require('./layer'),
   lineFeature: require('./lineFeature'),
+  lookupTable2D: require('./lookupTable2D'),
   markerFeature: require('./markerFeature'),
   meshColored: require('./meshColored'),
+  pixelmapFeature: require('./pixelmapFeature'),
   pointFeature: require('./pointFeature'),
   polygonFeature: require('./polygonFeature'),
   quadFeature: require('./quadFeature'),