Changeset 2118

Timestamp:

11/28/07 16:52:27 (5 years ago)

Author:

gyuque

Message:

lang/ruby/RubyESRIShape: updated test script

Files:

• lang/ruby/RubyESRIShape/test/shape-test/sample/jsonp_map.js (modified) (6 diffs)

lang/ruby/RubyESRIShape/test/shape-test/sample/jsonp_map.js

@@ -20 +20 @@
 var ShapeColors = {"bnda_1_1": "#897", "trans_rails": "#007", "transp_1_1": "#259"};
 var ShapeWidths = {"bnda_1_1": 0.5, "trans_rails": 1, "transp_1_1": 1};
+var ShapeFillColors = {"bnda_1_1": "#eeffe0", "trans_rails": null, "transp_1_1": null};
 
 var OUT;
@@ -132 +133 @@
                 g.lineWidth = ShapeWidths[ ShapeName ];
                 g.strokeStyle = ShapeColors[ ShapeName ];
+                g.fillStyle = ShapeFillColors[ ShapeName ];
                 var d = new DrawingTask(ShapeData, g, theCanvas.width-0, theCanvas.height-0);
                 var _this = this;
@@ -149 +151 @@
         this.currentPoint = 0;
         this.data = data;
+        this.newPath = true;
 }
 
 DrawingTask.prototype = {
         start: function() {
+                if (ShapeType != "point")
+                        this.g.beginPath();
+
                 this.next();
         },
@@ -192 +198 @@
                                         (sx2 < this.width && sx2 >= 0 && sy2 < this.height && sy2 >= 0))
                                 {
-                                        this.g.moveTo(sx1, sy1);
+                                        if (this.newPath)
+                                        {
+                                                this.newPath = false;
+                                                this.g.moveTo(sx1, sy1);
+                                        }
                                         this.g.lineTo(sx2, sy2);
                                 }
@@ -226 +236 @@
                         if (ShapeType != "point")
                         {
+                                if (ShapeFillColors[ ShapeName ])
+                                        this.g.fill();
                                 this.g.stroke();
                                 this.g.beginPath();
-                        }
+                                this.newPath = true;
+                        }
+
                         return this.popNextLine();
                 }
@@ -259 +273 @@
         AirportIcon.src = "apt.png"
 
+        document.getElementById("theCanvas").style.background = "#f0f2ff";
         AirportLabel = new HTMLLabel(document.body, document.getElementById("theCanvas"));