Changeset 14

Timestamp:

12/28/06 06:40:44 (2 years ago)

Author:

mikel

Message:

changes from metacarta, and recent hacks. on overdue checkin

Files:

• worldkit/com/brainoff/worldkitAnnotation.as (modified) (13 diffs)
• worldkit/com/brainoff/worldkitConfig.as (modified) (14 diffs)
• worldkit/com/brainoff/worldkitImages.as (modified) (3 diffs)
• worldkit/com/brainoff/worldkitInteraction.as (modified) (17 diffs)
• worldkit/com/brainoff/worldkitMain.as (modified) (1 diff)
• worldkit/com/brainoff/worldkitRSS.as (modified) (15 diffs)
• worldkit/worldkit.fla (modified) (previous)

worldkit/com/brainoff/worldkitAnnotation.as

@@ -14 +14 @@
-
-    private var mc:MovieClip;
-
-    private var depth:Number;
-    private var title:String;
@@ -28 +27 @@
-    private var vector:String;
-    private var vtype:String;
+    private var datestring:String;
-    private var date:Date;
-    private var precompile:Boolean;
@@ -44 +44 @@
-    private var jsargs:String;
-    private var color:Number;
+    private var createdate:Date;
-
-    private var initialplotcolor:Number;
@@ -57 +58 @@
-    private var fillalpha:Number;
-    private var window:String;
+    private var rssicon:String;
+    private var curralpha:Number;
-
-    private var colorobj:Color;
-
-
+, rssicon:String
-
-        this.main = main;
@@ -83 +86 @@
-        this.vector = vector;
-        this.vtype = vtype;
+        this.datestring = datestring;
-        this.date = new Date(worldkitUtil.parseDate(datestring));
-        this.precompile = precompile;
@@ -88 +92 @@
-            this.enddate = new Date(worldkitUtil.parseDate(enddate));
-        } 
+        this.rssicon = rssicon;
-
-        present = true;
@@ -107 +112 @@
-        }
-
+        createdate = new Date();
+        curralpha = 100;
-        mc[this.clipname].annotation = this;
-    }
@@ -175 +182 @@
-            interact.scaleAndPosition(mc,undefined);
-        }
+
+
+        if (conf.newitemcallback) {
+            var msg = "title=" + escape(title) + "&url=" + escape(url) +  "&summary=" + escape( summary.split("\"").join("\\\"") ) +  "&lat=" + escape(String(lat)) + "&lon=" + escape(String(lon)) + "&id=" + escape(id);      
+            interact.processClick("", "_" + conf.newitemcallback, msg);
+        }
-    }
-
@@ -242 +255 @@
-        } else if (vtype == "box") {
-            drawbox();
+        } else if (rssicon != undefined && rssicon != "") {
+            if (time == 1) {
+                loadrssicon();
+            } else {
+                activateicon(time);
+            }
-        } else if (icon != undefined && icon != "") {
-            if (time == 1) {
-                loadicon();
-
+ 
-        } else if (plotshape == "square") {
-            square();
@@ -280 +299 @@
-        var boxarray = vector.split(" ");
-        if (boxarray.length == 4) {
-
+2] + " " + boxarray[
-            vtype = "poly";
-            drawpoly();
@@ -354 +373 @@
-    }
-
+    private function loadrssicon():Void {
+        if (mc[clipname]["icon"] == undefined) {
+                mc[clipname].createEmptyMovieClip("icon",1);
+        }
+        if (! img.loadrssicon(mc[clipname]["icon"], rssicon)) {
+                worldkitUtil.setTimeout(this, "loadrssicon", 1000);
+        }
+    }
+    public function activateicon(time:Number) {
+        if (mc[clipname]["icon"] == undefined) {
+                return;
+        }
+        var iconwidth;
+        var alpha = 100;
+        if (time == 2) {
+                iconwidth = conf.rssiconwidth;
+                alpha = curralpha;
+        } else if (time == 3) {
+                iconwidth = conf.rssiconwidth * 1.5;
+        }
+        img.activateicon(mc[clipname]["icon"], rssicon, iconwidth);
+        mc[clipname]["icon"]._alpha = alpha;
+   }
+
-    //REVISIT 
-    private function tracks():Void {
@@ -449 +492 @@
-        }
-    }
+    public function forceActivate():Void {
+        if (activate == true) {
+                activate = false;
+                shape(2);
+        } else {
+                activate = true;
+                shape(3);
+        }
+    }
+
+    public function setAlphaFade(now:Date):Void {
+        if (curralpha == -1) { return; }
+        var s = (now - createdate) / 1000;
+        var clip;
+        if (mc[clipname]["icon"]) {
+                clip = mc[clipname]["icon"];
+        } else {
+                clip = mc[clipname];
+        }
+        clip._alpha = 100 - 100 * (s / conf.fade);
+        curralpha = clip._alpha;
+
+        if (curralpha <= 0) {
+                if (mc[clipname]["icon"]) {
+                        mc[clipname]["icon"].removeMovieClip();
+                        mc[clipname]["icon"] = 1;
+                } else {
+                        mc[clipname].clear();
+                }
+                if (conf.fadeditemcallback) {
+                        var msg = "&id=" + escape(id);  
+                        interact.processClick("", "_" + conf.fadeditemcallback, msg);
+                }       
+                curralpha = -1;
+        }       
+    }
-
-    public function hidetext():Void {
@@ -506 +585 @@
-        if (vector != this.vector) { this.vector = vector; changed = true; }
-        if (vtype != this.vtype) { this.vtype = vtype; changed = true; }
-
-
+
-        
-        return changed;

worldkit/com/brainoff/worldkitConfig.as

@@ -36 +36 @@
-    var enddate:Date;
-    var enddatefield:String;
+    var fade:Number;
+    var fadeditemcallback:String;
-    var fillalpha:worldkitConfigCat;
-    var fscommand:Boolean;
@@ -59 +61 @@
-    var maxzoom:Boolean;
-    var neartime:Number;
+    var newitemcallback:String;
-    var nightimg:String;
-    var north:Number;
+    var onzoompan:String;
-    var panc:Number;
-    var plotinterval:Number;
@@ -68 +72 @@
-    var precompile:Object; //beta
-    var projection:String;
+    var resultssince:Boolean;
-    var restingplotcolor:worldkitConfigCat;
+    var rssiconwidth:Number;
+    var rssbbox:Boolean;
-    var showload:Boolean;
-    var showonlynew:Boolean;
@@ -81 +88 @@
-    var textinterval:Number;
-    var textsize:Number;
+    var tilemap:Object;
-    var timenav:Boolean;
-    var timenavpos:Number;
@@ -118 +126 @@
-        enddate = new Date();
-        enddatefield = "any";
+        fade = -1;
-        fscommand = false;
-        grabber = false;
@@ -136 +145 @@
-        polarimg = "polar.jpg";
-        projection = "none";
+        resultssince = false;
+        rssbbox = false;
+        rssiconwidth = 20;
-        showload = false;
-        showonlynew = false;
@@ -171 +183 @@
-        swflayer = new Object();
-        swftemplate = new Object();
+        tilemap = new Object();
-        wms = new Object();
-
@@ -281 +294 @@
-        case "timenavpos":
-        case "neartime":
+        case "rssiconwidth":
+        case "fade":
-            this[name] = Number(value);
-            break;
@@ -301 +316 @@
-        case "startdatefield":
-        case "enddatefield":
+        case "newitemcallback":
+        case "onzoompan":
+        case "fadeditemcallback":
-
-            this[name] = value;
@@ -323 +341 @@
-        case "fscommand":
-        case "timenav":
+        case "resultssince":
+        case "rssbbox":
-
-            if (value == "true") {
@@ -432 +452 @@
-            if (attr.maxtiledeg != undefined) { this.wms[ attr.id ].maxtiledeg = attr.maxtiledeg; }
-            if (attr.time != undefined) { this.wms[ attr.id ].time =  new Date(worldkitUtil.parseDate(attr.time)); }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        case "precompile":
-            if (attr.id != undefined) {
@@ -527 +560 @@
-    private function processWMSConfig():Void {
-        for (var s in wms) {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-        
-1; i <= l
+start; i <= end
-                var id = s + i.toString();
-                swftemplate[ id ] = new Object();
@@ -542 +587 @@
-                    swftemplate[id].tileheight = h;
-                }
-
+
+
+
+
+
+
-                swftemplate[ id ].minscale = Math.pow(2, (i-1));
-maxscale
-
-maxscale
+wms[ s ].maxview
+ //BUG??
+wms[ s ].maxview
-            
-                if (wms[ s ].maxtiledeg) { //can actually assume maxtiledeg for default and calc REVISIT
@@ -565 +615 @@
-    }
-
-
-    public function getConfBySubject(option:String,cats:Array) {
-        for (var i=0; i<cats.length; i++) {

worldkit/com/brainoff/worldkitImages.as

@@ -105 +105 @@
-        for (var s in conf.swftemplate) {
-            imagemc.createEmptyMovieClip(s, layer + conf.swftemplate[s].layer);
-
+
+
+
-        } 
-        layer += l;
@@ -454 +456 @@
-                }
-                var tileurl = conf.swftemplate[id].url;
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-                conf.swflayer[tileid].url = tileurl;
@@ -621 +628 @@
-        }
-    }
+
+    public function loadrssicon(mc:MovieClip, url:String):Boolean {
+        var key:String = imagemc._name + ":" + escape(url);     
+        if (imagemc[ escape(url) ].loaded) {
+                mc.loadMovie(url);
+                var w = imglist[key]["mc"][escape(url)]._width;
+                var h = imglist[key]["mc"][escape(url)]._height;
+                mc._xscale = 100 *  conf.rssiconwidth / w;
+                mc._yscale = 100 * conf.rssiconwidth / w;
+                mc._x = - .5 * (conf.rssiconwidth);
+                mc._y = - .5 * (conf.rssiconwidth * h / w);
+                return true;
+        } else if (imglist[ key ] == undefined) {
+                loadImage(imagemc, escape(url), url, layer, "MakeInvisible", 0, 1, undefined, undefined, undefined, false);
+                layer++;
+        }
+        return false;
+    }
+    public function activateicon(mc:MovieClip, url:String, iconwidth:Number) {
+        var key:String = imagemc._name + ":" + escape(url);
+        var w = imglist[key]["mc"][escape(url)]._width;
+        var h = imglist[key]["mc"][escape(url)]._height;        
+        mc._xscale = 100 *  iconwidth / w;
+        mc._yscale = 100 * iconwidth / w;
+        mc._x = - .5 * (iconwidth);
+        mc._y = - .5 * (iconwidth * h / w);
+    }
+
-}

worldkit/com/brainoff/worldkitInteraction.as

@@ -12 +12 @@
-import com.brainoff.worldkitRSS;
-import com.brainoff.worldkitUtil;
+//import com.macromedia.javascript.JavaScriptProxy;
+import flash.external.*;
-
-class com.brainoff.worldkitInteraction {
@@ -24 +26 @@
-    private var keylistener:Object;
-    private var timenavplay:Boolean;
-
+
-
-    var centery:Number;
@@ -51 +53 @@
-    static private var timenavdepth = 10001;
-    static private var dialogdepth = 10003;
+    static private var crosshairdepth = 10004;
-
-    function worldkitInteraction(main:worldkitMain) {
@@ -98 +101 @@
-            acceptInput = true;
-        }
+
+        mc.attachMovie("worldkitCrosshair", "crosshair", crosshairdepth);
+        mc.crosshair.parent = this;
+        mc.crosshair._xscale =  100 * 100 * 2/conf.w;
+        mc.crosshair._yscale = 100 * 100 * 2/conf.w;
+        if (! conf.inputonly) {
+                mc.crosshair._alpha = 0;
+        }
+
+        //proxy = new JavaScriptProxy();
-    }
-
@@ -195 +208 @@
-                mc.toolbar[ b[i] ].onReleaseOutside = function() { this.parent.zoompan = ""; this._alpha = this.parent.conf.controlalpha; }
-                mc.toolbar[ b[i] ]._alpha = conf.controlalpha;
+            }
+            mc.toolbar["DragOn"].parent = this;
+            mc.toolbar["DragOff"].parent = this;
+            mc.toolbar["PanOn"].parent = this;
+            mc.toolbar["PanOff"].parent = this;
+            mc.toolbar["DragOff"].onPress = function() {
+                this.parent.conf.zoomselect = true;
+                this.parent.conf.grabber = false;
+                this.parent.mc.toolbar["PanOn"]._visible = 0;
+                this.parent.mc.toolbar["DragOn"]._visible = 1;
+            }
+            mc.toolbar["PanOff"].onPress = function() {
+                this.parent.conf.zoomselect = false;
+                this.parent.conf.grabber = true;
+                this.parent.mc.toolbar["PanOn"]._visible = 1;
+                this.parent.mc.toolbar["DragOn"]._visible = 0;
+            }
+            if (conf.zoomselect) {
+                mc.toolbar["PanOn"]._visible = 0;
+            } else {
+                mc.toolbar["DragOn"]._visible = 0;
-            }
-        } else {
@@ -232 +266 @@
-                    acceptInput = false;
-                    rss.inputToggle(acceptInput);
+                    Mouse.show();
+                    mc.crosshair._alpha = 0;
-                } else {
-                    acceptInput = true;
-                    rss.inputToggle(acceptInput); 
+                    Mouse.hide();
+                    mc.crosshair._alpha = 100;
-                }
-            }
@@ -243 +281 @@
-        }
-        zoompan = "";
+        if (conf.onzoompan) {
+                var args = "extent=" + cwest + "," + csouth + "," + ceast + "," + cnorth;
+                //getURL( conf.onzoompan + "(\"" + args + "\");" );
+                ExternalInterface.call( conf.onzoompan.substr(11), args);
+        }
-    }
-
@@ -250 +293 @@
-        if (acceptInput == true) {
-
-
+
+
+
+
+
-            rss.inputToggle(false);
-            annotate(_root._xmouse, _root._ymouse);
@@ -280 +327 @@
-
-    public function onMouseMove():Void {
+        mc.crosshair._x = _root._xmouse;
+        mc.crosshair._y = _root._ymouse;
+
-        if (mc.zoombox != undefined) {
-            mc.zoombox.clear();
@@ -337 +387 @@
-            mc.grabber.removeMovieClip();
-        }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    public function onEnterFrame():Void {
@@ -384 +453 @@
-                Zoom();
-                zoompan = "";
+                if (conf.onzoompan) {
+                        var args = "extent=" + cwest + "," + csouth + "," + ceast + "," + cnorth;
+                        ExternalInterface.call( conf.onzoompan.substr(11), args);
+                        //getURL(conf.onzoompan + "(\"" + args + "\");" );
+                }       
-                break;
-
@@ -512 +586 @@
-                fscommand(tmp[1], jsargs);
-            } else {
-
+
+
+
-            }
-        } else {
@@ -549 +625 @@
-                fscommand(tmp[1], args);
-            } else {
-
+
+
+
+
-            }
-        } else {
@@ -565 +644 @@
-        _root.JZoomComm = "";
-        _root.JActComm = "";
+        _root.JItemActComm = "";
-        _root.JAnnoComm = "";
-        _root.JHackComm = "";
-        _root.JInputComm = "";
-        _root.JGetItemComm = "";
+        _root.JNavmodecomm = "";
+        _root.JGetExtentComm = "";
-        _root.watch("JComm",worldkitInteraction.onJavascript,this);
-        _root.watch("JSubComm", worldkitInteraction.onJavascript,this);
@@ -576 +658 @@
-        _root.watch("JZoomComm", worldkitInteraction.onJavascript,this);
-        _root.watch("JActComm", worldkitInteraction.onJavascript,this);
+        _root.watch("JItemActComm", worldkitInteraction.onJavascript,this);
-        _root.watch("JAnnoComm", worldkitInteraction.onJavascript,this);
-        _root.watch("JHackComm", worldkitInteraction.onJavascript,this);
-        _root.watch("JInputComm", worldkitInteraction.onJavascript,this);
-        _root.watch("JGetItemComm", worldkitInteraction.onJavascript,this);
+        _root.watch("JNavmodeComm", worldkitInteraction.onJavascript,this);
+        _root.watch("JGetExtentComm", worldkitInteraction.onJavascript,this);
-    }
-
@@ -628 +713 @@
-        rss.onJActComm(newVal);
-    }
+    public function onJItemActComm(newVal) {
+        rss.onJItemActComm(newVal);
+    }
-    public function onJLoadComm(newVal) {
-        rss.onJLoadComm(newVal);
@@ -652 +740 @@
-    public function onJGetItemComm(newVal) {
-        rss.onJGetItemComm(newVal);
+    }
+    public function onJNavmodeComm(newVal) {
+        if (newVal == "zoomselect") {
+                conf.zoomselect = true;
+                conf.grabber = false;
+        } else if (newVal == "grabber") {
+                conf.grabber = true;
+                conf.zoomselect = false;
+        }
+    }
+    public function onJGetExtentComm(newVal) {
+        var args = "extent=" + cwest + "," + csouth + "," + ceast + "," + cnorth + "&" + "zoom=" + scale;
+        ExternalInterface.call( newVal, args);
+        _root.JGetExtentComm = "";
-    }
-    public function SetupTimenav():Void {

worldkit/com/brainoff/worldkitMain.as

@@ -7 +7 @@
-
-class com.brainoff.worldkitMain {
-0805
+2812
-
-    var conf:worldkitConfig;

worldkit/com/brainoff/worldkitRSS.as

@@ -23 +23 @@
-    private var prevlat:Object;
-    private var prevlon:Object;
+    private var lastRequest:Boolean;
+    private var intervalId:Number;
-
-    function worldkitRSS(main:worldkitMain) {
@@ -71 +73 @@
-            }
-            if (conf.update > 0) {
-       
+       intervalId = 
-            }
-            interact.LoadingDialog(conf.loadrssmsg);
+        }       
+        if (conf.fade != -1) {
+                setInterval( this, "setAlphaFade", 60000);
-        }
-    }
-        
-    public function loadData(url:String):Void {
+        if (conf.resultssince == true && lastRequest == true) {
+                if (url.indexOf("?") == -1) { url = url + "?"; }
+                //url = url + "&" + lastRequest;
+                var age = Math.ceil(conf.update / 60000);
+                url = url + "&age=" + age.toString(); //age is mc specific....
+        }
+        if (conf.rssbbox == true) {
+                if (url.indexOf("?") == -1) { url = url + "?"; }
+                var bbox = interact.cwest + "," + interact.csouth + "," + interact.ceast + "," + interact.cnorth;
+                url = url + "&bbox=" + bbox;
+
+        }       
-        if (conf.uniqueurls == true) {
-            var d = new Date();
@@ -89 +106 @@
-            rss.onLoad(this,success);
-        }
+        lastRequest = true; //new Date(); //set to now
-        loader.load(url);
+
-    }
-
@@ -175 +194 @@
-
-    private function parseItem(node:XMLNode):Void {
-
+, icon=undefined
-        var sub=new Array();
-
@@ -264 +283 @@
-            case("georss:polygon"):
-                list = nv;
-gon
+
-                break;
-            case("georss:box"):
@@ -283 +302 @@
-                } else if (node.childNodes[l].firstChild.nodeName == "gml:Polygon") {
-                    list = node.childNodes[l].firstChild.firstChild.firstChild.firstChild.firstChild.nodeValue;
-gon
+
-                } else if (node.childNodes[l].firstChild.nodeName == "gml:Envelope") {
-                    list = node.childNodes[l].firstChild.childNodes[0].firstChild.nodeValue + " " + node.childNodes[l].firstChild.childNodes[1].firstChild.nodeValue;
@@ -317 +336 @@
-                photo = nv;
-                break;
+            case("media:icon"):
+                icon = nv;
+                break;
-            case("pubdate"): //RSS 2.0
-            case("issued"): //Atom
@@ -331 +353 @@
-                }
-                break;
+            case("metacarta:geoextract"):
+                v = v + "<br/><font color='#ff0000'>" + nv + "</font>";
+                break;
-            default:
-            }
@@ -342 +367 @@
-        if (lat != "" && lon != "") {
-            g = lat + "," + lon;
-type == "poly" || type == "line
+list != "
-            var listtmp = list.split(" ");
-            lat = listtmp[0]; lon = listtmp[1];
@@ -364 +389 @@
-        sub.push("_default_");
-
-
+ || (type != "")
-            if (Points[id] == undefined) {
-                var plat,plon;
@@ -375 +400 @@
-                }
-
-
+,icon
-            
-                if (conf.plotinterval == 0) {
@@ -387 +412 @@
-            
-                if (conf.maxzoom) {
-
+
+
+
+
+
+
+
+
-                }
-                //record time extremes?
@@ -484 +516 @@
-    }
-
+    public function setAlphaFade():Void {
+        var now:Date = new Date();
+        for (var p in Points) {
+                Points[p].setAlphaFade(now);
+        }
+    }
+
-    public function setActive(nowActive:worldkitAnnotation):Void {
-        var a = activeAnnotation;
@@ -519 +558 @@
-        }
-    }
+    public function onJItemActComm(id:String):Void {
+        Points[id].forceActivate();
+    }
-    public function onJLoadComm(action:String):Void {
-        if (action == "updateurl") {
@@ -529 +571 @@
-            clear();
-        } else if (action != "") {
-
+
+
+
+
+
+
+
+
+
-            interact.LoadingDialog(conf.loadrssmsg);
-        }