Changeset 5

Timestamp:

03/08/06 07:35:17 (3 years ago)

Author:

mikel

Message:

javascript cat bug fixed; load order enforced; wms data alpha; rss reload bug fixed

Files:

• com/brainoff/worldkitAnnotation.as (modified) (2 diffs)
• com/brainoff/worldkitConfig.as (modified) (2 diffs)
• com/brainoff/worldkitImages.as (modified) (14 diffs)
• com/brainoff/worldkitInteraction.as (modified) (4 diffs)
• com/brainoff/worldkitMain.as (modified) (2 diffs)
• com/brainoff/worldkitRSS.as (modified) (4 diffs)

com/brainoff/worldkitAnnotation.as

@@ -92 +92 @@
-        activate = false;
-    
+        setparams();
+
+        if (this.precompile == undefined) {
+            clipname = this.depth + "point";
+            textname = this.depth + "pointtext";
+            mc.createEmptyMovieClip(clipname,this.depth);
+        } else {
+            clipname = this.title;
+            textname = this.title + "text";
+        }
+
+        if (this.precompile) {
+            colorobj = new Color(mc[ this.clipname ]);
+        }
+
+        mc[this.clipname].annotation = this;
+    }
+
+    public function setparams():Void {
-        initialplotcolor = conf.getConfBySubject("initialplotcolor", this.cats);
-        restingplotcolor = conf.getConfBySubject("restingplotcolor", this.cats);
@@ -104 +123 @@
-        fillalpha = conf.getConfBySubject("fillalpha", this.cats);
-        window = conf.getConfBySubject("window", this.cats);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-    public function plot():Void {
-        if  (precompile != true && conf.accuplot != true) {

com/brainoff/worldkitConfig.as

@@ -422 +422 @@
-            if (attr.height != undefined) { this.wms[ attr.id ].height = attr.height; } 
-            if (attr.maxtiledeg != undefined) { this.wms[ attr.id ].maxtiledeg = attr.maxtiledeg; }
+            if (attr.date != undefined) { this.wms[ attr.id ].date =  new Date(worldkitUtil.parseDate(attr.date)); }
-            break;
-            
@@ -549 +550 @@
-                }
-                swftemplate[ id ].category = wms[ s ].category;
+                swftemplate[ id ].date = wms[ s ].date;
-                swftemplate[ id ].layer = swftemplatelayer; swftemplatelayer++;
-            }

com/brainoff/worldkitImages.as

@@ -14 +14 @@
-    private var imglist:Object;
-    private var imagesLoading:Number;
+    private var startLoading:Number;
-
-    private var zmcb:Number;
@@ -29 +30 @@
-        layer = 1;
-        imagesLoading = 0;
+        startLoading = 0;
-        imglist = new Object();
-    }
@@ -45 +47 @@
-        case("day"):
-            if (length(conf.dayimg) > 0) { /* 0 length dayimg indicates don't load one */
-
+, undefined, undefined, undefined, true
-                layer++;
-            }
-            break;
-        case("zoomify"):
-
+, undefined, undefined, undefined, true
-            layer++;
-            break;
-        case("daynight"):
-
-
+, undefined, undefined, undefined, true
+, undefined, undefined, undefined, true
-            layer += 3; //+=3 because mask mc is created layer, should just create here REVISIT
-            break;
-
-        case("dymax"): //No one is using dymax, deprecate REVISIT
-
+, undefined, undefined, undefined, true
-            layer++;
-            break;
-        case("polar"): //slighty more useful than dymax but REVISIT
-
+, undefined, undefined, undefined, undefined, true
-            layer++;
-            break;
@@ -74 +76 @@
-        for (var s in conf.icon) {
-            if (conf.icon[s] != "") {
-
+, undefined, undefined, undefined, true
-                layer++;
-            }
@@ -85 +87 @@
-        for (var swf in conf.swflayer) {
-            if (conf.swflayer[swf].preload != false) { //need to save layer level if not preload
-
+, true
-                conf.swflayer[swf].parent = imagemc;
-                layer++;
@@ -104 +106 @@
-        checkSwfTemplate();
-
-
+
+
+
-    }
-
@@ -111 +115 @@
-      load a single image into worldKit, and rectify
-    */
-
-
-
+,start:Boolean
+
+,start
-
-        mc.createEmptyMovieClip(id, level);
@@ -129 +133 @@
-      Can't be stored in the MovieClip itself, since that is overwritten by the loaded image
-    */
-
+,start:Boolean
-        var key:String = mc._name + ":" + id;
-        imglist[ key ] = new Object();
@@ -143 +147 @@
-        imglist[ key ].extent = extent;
-        imglist[ key ].starttime = new Date();
+        imglist[ key ].start = start;
-
-        imagesLoading++;
+        if (start == true) startLoading++;
-    }
-
@@ -185 +191 @@
-        imagesLoading--;
-        imageDialog();
+
+        if (imglist[key].start) {
+            startLoading--;
+            if (startLoading == 0) {
+                main.signalDone("IMAGES");
+            }
+        }
-    }
-
-    public function onLoadError(target_mc:MovieClip):Void {
-        var key:String = target_mc._parent._name + ":" + target_mc._name;
+
+        /*
+          if (imglist[key].start) {
+            startLoading--;
+            if (startLoading == 0) {
+                main.signalDone("IMAGES");
+            }
+        }
+        */
+
-        delete imglist[key];
-
+        interact.LoadingDialog("Could not load " + target_mc._name);
-        target_mc.removeMovieClip();
-        imagesLoading--;
-
+
-    }
-
@@ -269 +293 @@
-        
-        if (isSwfVisible(mc,id)) {
+            //setTimeNavAlpha(mc,id);
-            mc[ id ]._visible = true;
-        } else {
@@ -303 +328 @@
-                interact.scaleAndPosition(mc, id, conf.swflayer[confid].extent);
-                mc[ id ]._visible = true;
+                //setTimeNavAlpha(mc,id);
-            }
-        } else {
@@ -403 +429 @@
-                conf.swflayer[tileid].maxview = conf.swftemplate[id].maxview;
-                conf.swflayer[tileid].category = conf.swftemplate[id].category;
+                conf.swflayer[tileid].date = conf.swftemplate[id].date;
-                conf.swflayer[tileid].parent = imagemc[id];
-                loadImage( imagemc[ id ], "swflayer" + tileid, tileurl, layer, "AdjustSwf", 0, 1, conf.swflayer[ tileid ].w, conf.swflayer[ tileid ].h, conf.swflayer[ tileid ].extent );
@@ -435 +462 @@
-        }
-
+        //if (conf.timenav != false && conf.swflayer[confid].date != undefined) {
+        //    var diff = Math.abs( interact.maxtime - conf.swflayer[confid].date );
+        //    trace(diff);
+        //    if (diff > 1382400000 * 2) {
+        //      trace("out of range");
+        //      visible = false;
+        //    }
+        //}
+
-        return visible;
-    }
-
+    //ALPHA wms time nav
+    public function setTimeNavAlpha(mc:MovieClip, id:String):Void {
+        var confid:String = id.substr(8);
+        if (conf.timenav != false && conf.swflayer[confid].date != undefined) {
+            var diff = Math.abs( interact.maxtime - conf.swflayer[confid].date );
+            mc[id]._alpha = 100 * (1382400000 * 2 - diff) / (1382400000 * 2)+ 30;
+        }
+    }
+           
-    public function sino(mc:MovieClip, id:String, mask:String):Void {
-        mc[mask].clear();

com/brainoff/worldkitInteraction.as

@@ -587 +587 @@
-    }
-    public function onJSubComm(newVal) {
+        newVal = newVal.toLowerCase();
-        rss.onJSubComm(newVal);
-    }
-    public function onJLayComm(newVal) {
-
+
+
-        /* categories should be handled locally - REVISIT */
-        var c = conf.categories[newVal];
@@ -606 +608 @@
-        var tmp = newVal.split(":");
-        var layer = tmp[0]; var val;
+        layer = layer.toLowerCase();
-        if (tmp[1] == "true") { 
-            val = true;
@@ -617 +620 @@
-    }
-    public function onJActComm(newVal) {
+        newVal = newVal.toLowerCase();
-        rss.onJActComm(newVal);
-    }
@@ -658 +662 @@
-        mc.timenav.timetext.htmlText = "<font face=\"Arial\" size=\"9\"><b>" + worldkitUtil.dateToString(maxtime) + "</b></font>";
-        rss.setVisible(true);
+        //img.Pan(); //ALPHA wms timenav
-    }
-    

com/brainoff/worldkitMain.as

@@ -7 +7 @@
-
-class com.brainoff.worldkitMain {
-17022006
+07032006-3
-
-    var conf:worldkitConfig;
@@ -39 +39 @@
-            interact.afterConf();
-            img.load();
+            interact.SetupInput();
+            break;
+        case "IMAGES":
-            worldkitGPX.start(this);
-            interact.SetupInput();
-            rss.start();
-            break;

com/brainoff/worldkitRSS.as

@@ -93 +93 @@
-
-    public function onLoad(xml:XML, success:Boolean):Void {
-        interact.LoadingDialog();
-        if (! success) {
-            return;
@@ -130 +129 @@
-            }
-        }
+        interact.LoadingDialog();
+        
-    }
-
@@ -388 +389 @@
-
-                Points[id].clearMC();
+                Points[id].setparams();
-                Points[id].plot();
-            }
@@ -514 +516 @@
-    public function onJLoadComm(action:String):Void {
-        if (action == "updateurl") {
-,true
+
-            interact.LoadingDialog(conf.loadrssmsg);
-        } else if (action == "dataurl") {
-,true
+
-            interact.LoadingDialog(conf.loadrssmsg);
-        } else if (action == "clear") {
-            clear();
-        } else if (action != "") {
-, true
+
-            interact.LoadingDialog(conf.loadrssmsg);
-        }