Move geometry parsing code to the Parser class

sixmen · sixmen · commit 059371cb1545 · 2012-10-14T08:43:44.000+09:00
diff --git a/lib/protocol/Parser.js b/lib/protocol/Parser.js
@@ -235,6 +235,58 @@ Parser.prototype.parseString = function(length) {
   return value;
 };
 
+Parser.prototype.parseGeometryValue = function() {
+  var buffer = this.parseLengthCodedBuffer();
+  var offset = 4;
+  function parseGeometry() {
+    var result = null;
+    var byteOrder = buffer.readUInt8(offset); offset += 1;
+    var wkbType = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
+    switch(wkbType) {
+      case 1: // WKBPoint
+        var x = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
+        var y = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
+        result = {x: x, y: y};
+        break;
+      case 2: // WKBLineString
+        var numPoints = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
+        result = [];
+        for(var i=numPoints;i>0;i--) {
+          var x = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
+          var y = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
+          result.push({x: x, y: y});
+        }
+        break;
+      case 3: // WKBPolygon
+        var numRings = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
+        result = [];
+        for(var i=numRings;i>0;i--) {
+          var numPoints = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
+          var line = [];
+          for(var j=numPoints;j>0;j--) {
+            var x = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
+            var y = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
+            line.push({x: x, y: y});
+          }
+          result.push(line);
+        }
+        break;
+      case 4: // WKBMultiPoint
+      case 5: // WKBMultiLineString
+      case 6: // WKBMultiPolygon
+      case 7: // WKBGeometryCollection
+        var num = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
+        var result = [];
+        for(var i=num;i>0;i--) {
+          result.push(parseGeometry());
+        }
+        break;
+    }
+    return result;
+  }
+  return parseGeometry();
+}
+
 Parser.prototype.reachedPacketEnd = function() {
   return this._offset === this._packetEnd;
 };
diff --git a/lib/protocol/packets/RowDataPacket.js b/lib/protocol/packets/RowDataPacket.js
@@ -66,55 +66,7 @@ RowDataPacket.prototype._typeCast = function(field, parser) {
         ? parser.parseLengthCodedBuffer()
         : parser.parseLengthCodedString();
     case Types.GEOMETRY:
-      var buffer = parser.parseLengthCodedBuffer();
-      var offset = 4;
-      function parseGeometry() {
-        var result = null;
-        var byteOrder = buffer.readUInt8(offset); offset += 1;
-        var wkbType = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
-        switch(wkbType) {
-          case 1: // WKBPoint
-            var x = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
-            var y = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
-            result = {x: x, y: y};
-            break;
-          case 2: // WKBLineString
-            var numPoints = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
-            result = [];
-            for(var i=numPoints;i>0;i--) {
-              var x = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
-              var y = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
-              result.push({x: x, y: y});
-            }
-            break;
-          case 3: // WKBPolygon
-            var numRings = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
-            result = [];
-            for(var i=numRings;i>0;i--) {
-              var numPoints = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
-              var line = [];
-              for(var j=numPoints;j>0;j--) {
-                var x = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
-                var y = byteOrder? buffer.readDoubleLE(offset) : buffer.readDoubleBE(offset); offset += 8;
-                line.push({x: x, y: y});
-              }
-              result.push(line);
-            }
-            break;
-          case 4: // WKBMultiPoint
-          case 5: // WKBMultiLineString
-          case 6: // WKBMultiPolygon
-          case 7: // WKBGeometryCollection
-            var num = byteOrder? buffer.readUInt32LE(offset) : buffer.readUInt32BE(offset); offset += 4;
-            var result = [];
-            for(var i=num;i>0;i--) {
-              result.push(parseGeometry());
-            }
-            break;
-        }
-        return result;
-      }
-      return parseGeometry();
+      return parser.parseGeometryValue();
     default:
       return parser.parseLengthCodedString();
   }
