Changeset 26

Timestamp:

03/08/07 05:38:56 (2 years ago)

Author:

mikel

Message:

WMS js interface; mutliple dataurl; load root image in zoomify

Files:

• worldkit/com/brainoff/worldkitConfig.as (modified) (11 diffs)
• worldkit/com/brainoff/worldkitImages.as (modified) (2 diffs)
• worldkit/com/brainoff/worldkitInteraction.as (modified) (4 diffs)
• worldkit/com/brainoff/worldkitMain.as (modified) (1 diff)
• worldkit/com/brainoff/worldkitRSS.as (modified) (4 diffs)

worldkit/com/brainoff/worldkitConfig.as

@@ -28 +28 @@
-    var controlalpha;
-    var controlscale;
-String
+Array
-    var dayimg:String;
-    var displaytype:String;
@@ -97 +97 @@
-    var uniqueurls:Boolean; //true;
-    var update:Number;
-String
+Array
-    var visinterval:Number;
-    var w:Number;
@@ -117 +117 @@
-        controlalpha = 70;
-        controlscale = 100;
-        dataurl = "data.xml";
-        dayimg = "day.jpg";
-        displaytype = "daynight";
@@ -165 +164 @@
-        uniqueurls = false;
-        update = 60;
-        updateurl = "";
-        visinterval = 5000;
-        w = 1000;
@@ -183 +181 @@
-        tilemap = new Object();
-        wms = new Object();
+        dataurl = new Array(); dataurl[0] = "data.xml";
+        updateurl = new Array();
-
-        activatecolor = new worldkitConfigCat(0xFF0000);
@@ -304 +304 @@
-        case "polarimg":
-        case "zoomifydir":
-
+//
-        case "update":
-        case "updateurl":
@@ -534 +534 @@
-            break;
-
+        case "dataurl":
+                // one missing case . if user sets data.xml
+            if (this.dataurl[0] == "") {
+            } else if (value == "") {
+                this.dataurl = new Array("");
+            } else if (this.dataurl.length == 1 && this.dataurl[0] == "data.xml") {
+                this.dataurl[0] = value;
+            } else {
+                this.dataurl.push( value);
+            }
+            break;
+                
+                
+        case "updateurl":
+            this[name].push( value );
+            break;
+
-        default:
-        } 
@@ -571 +588 @@
-    private function processWMSConfig():Void {
-        for (var s in wms) {
+
+            if (wms[ s ].processed) { continue; }
-
-            var start; var end;
@@ -624 +643 @@
-                swftemplate[ id ].layer = swftemplatelayer; swftemplatelayer++;
-            }
+
+            wms[ s ].processed = true;
-        }
-    }
@@ -676 +697 @@
-            var tiledegw;
-            var tiledegh;
+
+        
+            dayimg = zoomifydir + "/TileGroup0/0-0-0.jpg";
-
-            while ((levelwidth <= zoomwidth) && (levelheight <= zoomheight)) {
@@ -735 +759 @@
-    }
-
+    public function addNewWMS(args) {
+        this.wms[ args.id ] = args;
+        processWMSConfig();
+    }
-}
-

worldkit/com/brainoff/worldkitImages.as

@@ -91 +91 @@
-        for (var s in conf.swftemplate) {
-            imagemc.createEmptyMovieClip(s, layer + conf.swftemplate[s].layer);
+            conf.swftemplate[ s ].mc_created = true;
-        } 
-        layer += conf.swftemplatelayer;
@@ -396 +397 @@
-    }
-
+    public function addNewSwfTemplates() {
+        for (var s in conf.swftemplate) {
+            if (conf.swftemplate[ s ].mc_created != true) {
+                imagemc.createEmptyMovieClip(s, layer + conf.swftemplate[s].layer);
+                conf.swftemplate[ s ].mc_created = true;
+            }
+        } 
+    }
+
-    /* Given a location and swftemplate id
-        determine which tiles to load

worldkit/com/brainoff/worldkitInteraction.as

@@ -642 +642 @@
-        _root.JNavmodecomm = "";
-        _root.JGetExtentComm = "";
+        _root.JWMSComm = "";
-        _root.watch("JComm",worldkitInteraction.onJavascript,this);
-        _root.watch("JSubComm", worldkitInteraction.onJavascript,this);
@@ -656 +657 @@
-        _root.watch("JNavmodeComm", worldkitInteraction.onJavascript,this);
-        _root.watch("JGetExtentComm", worldkitInteraction.onJavascript,this);
+        _root.watch("JWMSComm", worldkitInteraction.onJavascript,this);
-    }
-
@@ -745 +747 @@
-        ExternalInterface.call( newVal, args);
-        _root.JGetExtentComm = "";
+    }
+    public function onJWMSComm(newVal) {
+        var params = new LoadVars();
+        params.decode(newVal);
+        conf.addNewWMS(params);
+        img.addNewSwfTemplates();
+        img.Pan();
-    }
-    public function SetupTimenav():Void {
@@ -970 +979 @@
-        }
-
-        if (tiled && false) {
-                var wsen = extent.split(",");
-                xy = geo2xy(wsen[1], wsen[2], undefined, true);
-                xanother = xy[0] * scale * w / conf.w;
-                yanother = xy[1] * scale * h / conf.h;
-
-                var x2 = - ((w - wfactor) / 2 + ((scale - 1) * w / 2)) + xoffset + xanother;
-                var y2 = - ((h - hfactor) / 2 + ((scale - 1) * h / 2)) + yoffset + yanother;
-                x2 = Math.round(x2 * 20) / 20;
-                y2 = Math.round(y2 * 20) / 20;
-                trace( id + " " + clip._x + " " + clip._y);
-                trace( id + " " + x2 + "," + y2 + " " + (clip._x + clip._width) + "," + (clip._y + clip._height) );
-
-                //clip._width += (x2 - (clip._x + clip._width));
-                //clip._height += (y2 - (clip._y + clip._height));
-                var xdiff = x2 - (clip._x + clip._width);
-                var ydiff = y2 - (clip._y + clip._height);
-                if (xdiff > 0.0001 && xdiff < 1) {
-                        clip._width += xdiff;
-                } 
-                if (ydiff > 0.0001 && ydiff < 1) {      
-                        clip._height += ydiff;   
-                        //trace( id + " " + x2 + "," + y2 + " " + (clip._x + clip._width) + "," + (clip._y + clip._height) );
-                }
-                trace( id + " " + x2 + "," + y2 + " " + (clip._x + clip._width) + "," + (clip._y + clip._height) );
-        }
-    }
-

worldkit/com/brainoff/worldkitMain.as

@@ -7 +7 @@
-
-class com.brainoff.worldkitMain {
-1-20070201
+2-20070306
-
-    var conf:worldkitConfig;

worldkit/com/brainoff/worldkitRSS.as

@@ -67 +67 @@
-        }
-
-length(conf.dataurl)
+conf.dataurl.length
-            loadData(conf.dataurl);
-length(conf.updateurl)
+conf.updateurl.length
-                conf.updateurl = conf.dataurl;
-            }
@@ -82 +82 @@
-    }
-        
-
+
+
+
-        if (conf.resultssince == true  && lastRequest != undefined) {
-                if (url.indexOf("?") == -1) { url = url + "?"; }
@@ -109 +111 @@
-        lastRequest = worldkitUtil.dateToString(now); //set to now
-        loader.load(url);
-
+
-    }
-
@@ -583 +585 @@
-            clear();
-        } else if (action != "") {
-action
+Array(action)
-            if (conf.update > 0) {
-                if (intervalId) {