Merge pull request gdsestimating#34 from Serthys/master

Added AutoCad color index to the layer data

dist/dxf-parser.js

@@ -988,7 +988,8 @@ DxfParser.prototype._parse = function(dxfString) {
 				case 62: // color, visibility
 					layer.visible = curr.value >= 0;
 					// TODO 0 and 256 are BYBLOCK and BYLAYER respectively. Need to handle these values for layers?.
-					layer.color = getAcadColor(Math.abs(curr.value));
+					layer.colorIndex = Math.abs(curr.value);
+					layer.color = getAcadColor(layer.colorIndex);
 					curr = scanner.next();
 					break;
 				case 70: // frozen layer

lib/DxfParser.js

@@ -575,7 +575,8 @@ DxfParser.prototype._parse = function(dxfString) {
 				case 62: // color, visibility
 					layer.visible = curr.value >= 0;
 					// TODO 0 and 256 are BYBLOCK and BYLAYER respectively. Need to handle these values for layers?.
-					layer.color = getAcadColor(Math.abs(curr.value));
+					layer.colorIndex = Math.abs(curr.value);
+					layer.color = getAcadColor(layer.colorIndex);
 					curr = scanner.next();
 					break;
 				case 70: // frozen layer

package.json

@@ -1,6 +1,6 @@
 {
   "name": "dxf-parser",
-  "version": "0.6.1",
+  "version": "0.7.0",
   "description": "Parse dxf files into a readable, logical js object.",
   "main": "index.js",
   "scripts": {

test/data/extendeddata.expected.json

@@ -986,6 +986,7 @@
           "name": "0",
           "frozen": false,
           "visible": true,
+          "colorIndex": 7,
           "color": 16777215
         }
       }

test/data/layer-table.expected.json

@@ -6,12 +6,14 @@
       "frozen": false,
       "name": "0",
       "visible": true,
+      "colorIndex": 7,
       "color": 16777215
     },
     "Layer 1": {
       "frozen": true,
       "name": "Layer 1",
       "visible": true,
+      "colorIndex": 7,
       "color": 16777215
     }
   }