Replace hashCode with checksum

Hash codes are not collision free, so what we
actually need is a checksum.

src/ol/structs/checksum.js

@@ -0,0 +1,22 @@
+goog.provide('ol.structs.IHasChecksum');
+
+
+/**
+ * @typedef {string}
+ */
+ol.structs.Checksum;
+
+
+
+/**
+ * @interface
+ */
+ol.structs.IHasChecksum = function() {
+};
+
+
+/**
+ * @return {string} The checksum.
+ */
+ol.structs.IHasChecksum.prototype.getChecksum = function() {
+};

src/ol/structs/hashable.js

@@ -1,16 +0,0 @@
-goog.provide('ol.structs.IHashable');
-
-
-
-/**
- * @interface
- */
-ol.structs.IHashable = function() {
-};
-
-
-/**
- * @return {number} The hash code.
- */
-ol.structs.IHashable.prototype.hashCode = function() {
-};

src/ol/style/circlestyle.js

@@ -2,10 +2,9 @@ goog.provide('ol.style.Circle');
 
 goog.require('goog.dom');
 goog.require('goog.dom.TagName');
-goog.require('goog.string');
 goog.require('ol.color');
 goog.require('ol.render.canvas');
-goog.require('ol.structs.IHashable');
+goog.require('ol.structs.IHasChecksum');
 goog.require('ol.style.Fill');
 goog.require('ol.style.Image');
 goog.require('ol.style.ImageState');
@@ -20,7 +19,7 @@ goog.require('ol.style.Stroke');
  * @constructor
  * @param {olx.style.CircleOptions=} opt_options Options.
  * @extends {ol.style.Image}
- * @implements {ol.structs.IHashable}
+ * @implements {ol.structs.IHasChecksum}
  * @api
  */
 ol.style.Circle = function(opt_options) {
@@ -78,6 +77,12 @@ ol.style.Circle = function(opt_options) {
    */
   this.size_ = [size, size];
 
+  /**
+   * @private
+   * @type {Array.<ol.structs.Checksum>|null}
+   */
+  this.checksums_ = null;
+
   /**
    * @type {boolean}
    */
@@ -268,15 +273,22 @@ ol.style.Circle.prototype.render_ = function() {
 /**
  * @inheritDoc
  */
-ol.style.Circle.prototype.hashCode = function() {
-  var hash = 17;
+ol.style.Circle.prototype.getChecksum = function() {
+  var strokeChecksum = !goog.isNull(this.stroke_) ?
+      this.stroke_.getChecksum() : '-';
+  var fillChecksum = !goog.isNull(this.fill_) ?
+      this.fill_.getChecksum() : '-';
 
-  hash = hash * 23 + (!goog.isNull(this.stroke_) ?
-      this.stroke_.hashCode() : 0);
-  hash = hash * 23 + (!goog.isNull(this.fill_) ?
-      this.fill_.hashCode() : 0);
-  hash = hash * 23 + (goog.isDef(this.radius_) ?
-      goog.string.hashCode(this.radius_.toString()) : 0);
+  var recalculate = goog.isNull(this.checksums_) ||
+      (strokeChecksum != this.checksums_[1] ||
+      fillChecksum != this.checksums_[2] ||
+      this.radius_ != this.checksums_[3]);
 
-  return hash;
+  if (recalculate) {
+    var checksum = 'c' + strokeChecksum + fillChecksum +
+        (goog.isDef(this.radius_) ? this.radius_.toString() : '-');
+    this.checksums_ = [checksum, strokeChecksum, fillChecksum, this.radius_];
+  }
+
+  return this.checksums_[0];
 };

src/ol/style/fillstyle.js

@@ -1,8 +1,7 @@
 goog.provide('ol.style.Fill');
 
-goog.require('goog.string');
 goog.require('ol.color');
-goog.require('ol.structs.IHashable');
+goog.require('ol.structs.IHasChecksum');
 
 
 
@@ -12,7 +11,7 @@ goog.require('ol.structs.IHashable');
  *
  * @constructor
  * @param {olx.style.FillOptions=} opt_options Options.
- * @implements {ol.structs.IHashable}
+ * @implements {ol.structs.IHasChecksum}
  * @api
  */
 ol.style.Fill = function(opt_options) {
@@ -24,6 +23,12 @@ ol.style.Fill = function(opt_options) {
    * @type {ol.Color|string}
    */
   this.color_ = goog.isDef(options.color) ? options.color : null;
+
+  /**
+   * @private
+   * @type {?ol.structs.Checksum}
+   */
+  this.checksum_ = null;
 };
 
 
@@ -44,17 +49,18 @@ ol.style.Fill.prototype.getColor = function() {
  */
 ol.style.Fill.prototype.setColor = function(color) {
   this.color_ = color;
+  this.checksum_ = null;
 };
 
 
 /**
  * @inheritDoc
  */
-ol.style.Fill.prototype.hashCode = function() {
-  var hash = 17;
+ol.style.Fill.prototype.getChecksum = function() {
+  if (goog.isNull(this.checksum_)) {
+    this.checksum_ = 'f' + (!goog.isNull(this.color_) ?
+        ol.color.asString(this.color_) : '-');
+  }
 
-  hash = hash * 23 + (!goog.isNull(this.color_) ?
-      goog.string.hashCode(ol.color.asString(this.color_)) : 0);
-
-  return hash;
+  return this.checksum_;
 };

src/ol/style/strokestyle.js

@@ -1,8 +1,9 @@
 goog.provide('ol.style.Stroke');
 
-goog.require('goog.string');
+goog.require('goog.crypt');
+goog.require('goog.crypt.Md5');
 goog.require('ol.color');
-goog.require('ol.structs.IHashable');
+goog.require('ol.structs.IHasChecksum');
 
 
 
@@ -15,7 +16,7 @@ goog.require('ol.structs.IHashable');
  *
  * @constructor
  * @param {olx.style.StrokeOptions=} opt_options Options.
- * @implements {ol.structs.IHashable}
+ * @implements {ol.structs.IHasChecksum}
  * @api
  */
 ol.style.Stroke = function(opt_options) {
@@ -57,6 +58,12 @@ ol.style.Stroke = function(opt_options) {
    * @type {number|undefined}
    */
   this.width_ = options.width;
+
+  /**
+   * @private
+   * @type {?ol.structs.Checksum}
+   */
+  this.checksum_ = null;
 };
 
 
@@ -122,6 +129,7 @@ ol.style.Stroke.prototype.getWidth = function() {
  */
 ol.style.Stroke.prototype.setColor = function(color) {
   this.color_ = color;
+  this.checksum_ = null;
 };
 
 
@@ -133,6 +141,7 @@ ol.style.Stroke.prototype.setColor = function(color) {
  */
 ol.style.Stroke.prototype.setLineCap = function(lineCap) {
   this.lineCap_ = lineCap;
+  this.checksum_ = null;
 };
 
 
@@ -144,6 +153,7 @@ ol.style.Stroke.prototype.setLineCap = function(lineCap) {
  */
 ol.style.Stroke.prototype.setLineDash = function(lineDash) {
   this.lineDash_ = lineDash;
+  this.checksum_ = null;
 };
 
 
@@ -155,6 +165,7 @@ ol.style.Stroke.prototype.setLineDash = function(lineDash) {
  */
 ol.style.Stroke.prototype.setLineJoin = function(lineJoin) {
   this.lineJoin_ = lineJoin;
+  this.checksum_ = null;
 };
 
 
@@ -166,6 +177,7 @@ ol.style.Stroke.prototype.setLineJoin = function(lineJoin) {
  */
 ol.style.Stroke.prototype.setMiterLimit = function(miterLimit) {
   this.miterLimit_ = miterLimit;
+  this.checksum_ = null;
 };
 
 
@@ -177,27 +189,33 @@ ol.style.Stroke.prototype.setMiterLimit = function(miterLimit) {
  */
 ol.style.Stroke.prototype.setWidth = function(width) {
   this.width_ = width;
+  this.checksum_ = null;
 };
 
 
 /**
  * @inheritDoc
  */
-ol.style.Stroke.prototype.hashCode = function() {
-  var hash = 17;
+ol.style.Stroke.prototype.getChecksum = function() {
+  if (goog.isNull(this.checksum_)) {
+    var raw = 's' +
+        (!goog.isNull(this.color_) ?
+            ol.color.asString(this.color_) : '-') + ',' +
+        (goog.isDef(this.lineCap_) ?
+            this.lineCap_.toString() : '-') + ',' +
+        (!goog.isNull(this.lineDash_) ?
+            this.lineDash_.toString() : '-') + ',' +
+        (goog.isDef(this.lineJoin_) ?
+            this.lineJoin_ : '-') + ',' +
+        (goog.isDef(this.miterLimit_) ?
+            this.miterLimit_.toString() : '-') + ',' +
+        (goog.isDef(this.width_) ?
+            this.width_.toString() : '-');
 
-  hash = hash * 23 + (!goog.isNull(this.color_) ?
-      goog.string.hashCode(ol.color.asString(this.color_)) : 0);
-  hash = hash * 23 + (goog.isDef(this.lineCap_) ?
-      goog.string.hashCode(this.lineCap_.toString()) : 0);
-  hash = hash * 23 + (!goog.isNull(this.lineDash_) ?
-      goog.string.hashCode(this.lineDash_.toString()) : 0);
-  hash = hash * 23 + (goog.isDef(this.lineJoin_) ?
-      goog.string.hashCode(this.lineJoin_) : 0);
-  hash = hash * 23 + (goog.isDef(this.miterLimit_) ?
-      goog.string.hashCode(this.miterLimit_.toString()) : 0);
-  hash = hash * 23 + (goog.isDef(this.width_) ?
-      goog.string.hashCode(this.width_.toString()) : 0);
+    var md5 = new goog.crypt.Md5();
+    md5.update(raw);
+    this.checksum_ = goog.crypt.byteArrayToString(md5.digest());
+  }
 
-  return hash;
+  return this.checksum_;
 };