From: Koichi KAMICHI <kamichi@fonts.jp>
Date: Fri, 17 Mar 2006 14:05:11 +0000 (+0000)
Subject:  Use polygon instead of polyline.
X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=87f55dc43dacf5c3d7b3fa4f460de461c9030fa5;p=chise%2Fkage.git

 Use polygon instead of polyline.
 Added data check.
---

diff --git a/engine/polygon.js b/engine/polygon.js
index 526d0c4..c2e3907 100755
--- a/engine/polygon.js
+++ b/engine/polygon.js
@@ -23,7 +23,7 @@ function Polygon(number){
     this.array = this.array.concat(poly.array);
   }
   Polygon.prototype.concat = concat;
-  
+
   // property
   this.array = new Array();
   
diff --git a/engine/polygons.js b/engine/polygons.js
index 38fe2b7..6e95331 100755
--- a/engine/polygons.js
+++ b/engine/polygons.js
@@ -1,7 +1,40 @@
 function Polygons(){
   // method
   function push(polygon){ // void
-    this.array.push(polygon);
+    // only a simple check
+    var minx = 200;
+    var maxx = 0;
+    var miny = 200;
+    var maxy = 0;
+    for(var i = 0; i < polygon.array.length; i++){
+      if(polygon.array[i].x < minx){
+	minx = polygon.array[i].x;
+      }
+      if(polygon.array[i].x > maxx){
+	maxx = polygon.array[i].x;
+      }
+      if(polygon.array[i].y < miny){
+	miny = polygon.array[i].y;
+      }
+      if(polygon.array[i].y > maxy){
+	maxy = polygon.array[i].y;
+      }
+    }
+    if(minx != maxx && miny != maxy && polygon.array.length >= 3){
+      var newArray = new Array();
+      newArray.push(polygon.array.shift());
+      while(polygon.array.length != 0){
+	var temp = polygon.array.shift();
+	if(newArray[newArray.length - 1].x != temp.x ||
+	   newArray[newArray.length - 1].y != temp.y){
+	  newArray.push(temp);
+	}
+      }
+      if(newArray.length >= 3){
+	polygon.array = newArray;
+	this.array.push(polygon);
+      }
+    }
   }
   Polygons.prototype.push = push;
   
@@ -10,11 +43,10 @@ function Polygons(){
     buffer += "<svg xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\" version=\"1.1\" baseProfile=\"full\">\n";
     buffer += "<g fill=\"black\">\n";
     for(var i = 0; i < this.array.length; i++){
-      buffer += "<polyline points=\"";
+      buffer += "<polygon points=\"";
       for(var j = 0; j < this.array[i].array.length; j++){
         buffer += this.array[i].array[j].x + "," + this.array[i].array[j].y + " ";
       }
-      buffer += this.array[i].array[0].x + "," + this.array[i].array[0].y + " ";
       buffer += "\" />\n";
     }
     buffer += "</g>\n";