Changeset 2121

Timestamp:

11/28/07 17:52:00 (14 months ago)

Author:

gyuque

Message:

lang/ruby/RubyESRIShape: updated test script and data

Location:

lang/ruby/RubyESRIShape/test/shape-test

Files:

• bnda_1_1.dbf (added)
• make_prefs.rb (added)
• sample/jsonp_map.html (modified) (1 diff)
• sample/jsonp_map.js (modified) (4 diffs)
• sample/pref_points.jsonp (added)

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

@@ -22 +22 @@
         font-weight: bold;
         color: #000;
+}
+
+.pref-name {
+        display: block;
+        text-align: center;
+        width: 160px;
+        color: #666;
+        text-shadow: 1px 1px 2px #fff;
 }
 

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

@@ -4 +4 @@
 
 var JSONP_files = [
+        "./pref_points.jsonp",
         "./japan_1.jsonp",
         "./japan_2.jsonp",
@@ -18 +19 @@
 ];
 
-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 ShapeColors = {"pref_points": null, "bnda_1_1": "#897", "trans_rails": "#007", "transp_1_1": "#259"};
+var ShapeWidths = {"pref_points": null, "bnda_1_1": 0.5, "trans_rails": 1, "transp_1_1": 1};
+var ShapeFillColors = {"pref_points": null, "bnda_1_1": "#eeffe0", "trans_rails": null, "transp_1_1": null};
 
 var OUT;
 var AirportIcon;
 var AirportLabel;
+var PrefLabel;
 
 var Params;
@@ -184 +186 @@
                                 if (sx < this.width && sx >= 0 && sy < this.height && sy >= 0)
                                 {
-                                        this.g.drawImage(AirportIcon, Math.floor(sx) - 10, Math.floor(sy) - 10);
-                                        AirportLabel.create(dat.name, sx + 15, sy - 5, 10, "airport-name");
+                                        if (ShapeName == "pref_points")
+                                        {
+                                                PrefLabel.create(dat.name, sx-80, sy - 5, 14, "pref-name");
+                                        }
+                                        else
+                                        {
+                                                this.g.drawImage(AirportIcon, Math.floor(sx) - 10, Math.floor(sy) - 10);
+                                                AirportLabel.create(dat.name, sx + 15, sy - 5, 10, "airport-name");
+                                        }
                                 }
                         }
@@ -275 +284 @@
         document.getElementById("theCanvas").style.background = "#f0f2ff";
         AirportLabel = new HTMLLabel(document.body, document.getElementById("theCanvas"));
+        PrefLabel = new HTMLLabel(document.body, document.getElementById("theCanvas"));
 
         OUT = new DebugOut();