From f22a14d4cde3afe6fb45cbc5feb569511a1bd5b4 Mon Sep 17 00:00:00 2001 From: alkadi-mh Date: Sun, 29 Nov 2020 17:20:10 -0800 Subject: [PATCH 01/26] upload folder --- package.json | 4 +-- static/traces/trace.js | 80 ++++++++++++++++++++++++------------------ web/index.html | 2 +- 3 files changed, 49 insertions(+), 37 deletions(-) diff --git a/package.json b/package.json index 7dfbe60..37af3f2 100644 --- a/package.json +++ b/package.json @@ -27,13 +27,13 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/networkcube/vistorian-map.git" + "url": "git+https://github.com/alkadi-mh/vistorian-map_tr.git" }, "collaborators": [ "Jean-Daniel Fekete storageType.setItem(LoggingPhase,true); + const StartedLogging=() => storageType.getItem(LoggingPhase); + UpdateLoggingStorage(); + trace = {version: "0.3"}; trace.url = function(url) { @@ -27,15 +34,16 @@ }; var uuid = function() { - var uuid = "", i, random; - for (i = 0; i < 32; i++) { - random = Math.random() * 16 | 0; - - if (i == 8 || i == 12 || i == 16 || i == 20) { - uuid += "-"; - } - uuid += (i == 12 ? 4 : (i == 16 ? (random & 3 | 8) : random)).toString(16); - } + var uuid = "", i, random; + for (i = 0; i < 32; i++) { + random = Math.random() * 16 | 0; + + if (i == 8 || i == 12 || i == 16 || i == 20) { + uuid += "-"; + } + uuid += (i == 12 ? 4 : (i == 16 ? (random & 3 | 8) : random)).toString(16); + } + return uuid; }; @@ -106,29 +114,33 @@ } function traceEvent(cat, action, label, value) { - // if (starting) { - // starting = false; - // _sending = []; - // traceEvent("_trace", "document.location", "href", document.location.href); - // traceEvent("_trace", "browser", "userAgent", navigator.userAgent); - // traceEvent("_trace", "screen", "size", "w:"+screen.width+";h:"+screen.height); - // traceEvent("_trace", "window", "innerSize", "w:"+window.innerWidth+";h:"+window.innerHeight); - // _sending = null; - // } - - // if (debug) { - // window.console && console.log("Track["+cat+","+action+","+label+"]"); - // } - // var ts = Date.now(); - // _traceq.push({"session": sessionId, - // "ts": ts, - // "cat": cat, - // "action": action, - // "label": label, - // "value": value}); - // if (_sending == null) - // sendLogs(); - // return trace; + if (starting) { + //if (StartedLogging()) { + // storageType.setItem(LoggingPhase,false); + + starting = false; + _sending = []; + traceEvent("log_1", "Vistorian Trace", "Session", "Start"); + traceEvent("_trace", "document.location", "href", document.location.href); + traceEvent("_trace", "browser", "userAgent", navigator.userAgent); + traceEvent("_trace", "screen", "size", "w:"+screen.width+";h:"+screen.height); + traceEvent("_trace", "window", "innerSize", "w:"+window.innerWidth+";h:"+window.innerHeight); + _sending = null; + } + + if (debug) { + window.console && console.log("Track["+cat+","+action+","+label+"]"); + } + var ts = Date.now(); + _traceq.push({"session": sessionId, + "ts": ts, + "cat": cat, + "action": action, + "label": label, + "value": value}); + if (_sending == null) + sendLogs(); + return trace; } // console.log("Trace initialized with sessionId=%s", sessionId); @@ -150,4 +162,4 @@ trace.eventDeferred = traceEventDeferred; trace.eventClear = traceEventClear; sessionId = uuid(); -})(); \ No newline at end of file +})(); diff --git a/web/index.html b/web/index.html index f99bb31..b124fca 100644 --- a/web/index.html +++ b/web/index.html @@ -36,7 +36,7 @@ Manual + onclick="trace.event('hlp_1', 'Vis Map', 'Vis Manual', 'click')">Manual
From a58dfd9a1e18332a9305c815501cb2cd45ed9935 Mon Sep 17 00:00:00 2001 From: alkadi-mh Date: Mon, 1 Feb 2021 05:38:23 -0800 Subject: [PATCH 02/26] fixes --- docs/assets/js/main.js | 2 +- static/traces/trace.js | 80 ++++++++++++++++++++++++++---------------- 2 files changed, 50 insertions(+), 32 deletions(-) diff --git a/docs/assets/js/main.js b/docs/assets/js/main.js index 528a3b0..c9d940e 100644 --- a/docs/assets/js/main.js +++ b/docs/assets/js/main.js @@ -2,4 +2,4 @@ }));for(b=0;c>b;b++)n.find(a,e[b],d);return d=this.pushStack(c>1?n.unique(d):d),d.selector=this.selector?this.selector+" "+a:a,d},filter:function(a){return this.pushStack(x(this,a||[],!1))},not:function(a){return this.pushStack(x(this,a||[],!0))},is:function(a){return!!x(this,"string"==typeof a&&u.test(a)?n(a):a||[],!1).length}});var y,z=/^(?:\s*(<[\w\W]+>)[^>]*|#([\w-]*))$/;(n.fn.init=function(a,b){var c,d;if(!a)return this;if("string"==typeof a){if(!(c="<"===a[0]&&">"===a[a.length-1]&&a.length>=3?[null,a,null]:z.exec(a))||!c[1]&&b)return!b||b.jquery?(b||y).find(a):this.constructor(b).find(a);if(c[1]){if(b=b instanceof n?b[0]:b,n.merge(this,n.parseHTML(c[1],b&&b.nodeType?b.ownerDocument||b:l,!0)),v.test(c[1])&&n.isPlainObject(b))for(c in b)n.isFunction(this[c])?this[c](b[c]):this.attr(c,b[c]);return this}return d=l.getElementById(c[2]),d&&d.parentNode&&(this.length=1,this[0]=d),this.context=l,this.selector=a,this}return a.nodeType?(this.context=this[0]=a,this.length=1,this):n.isFunction(a)?void 0!==y.ready?y.ready(a):a(n):(void 0!==a.selector&&(this.selector=a.selector,this.context=a.context),n.makeArray(a,this))}).prototype=n.fn,y=n(l);var B=/^(?:parents|prev(?:Until|All))/,C={children:!0,contents:!0,next:!0,prev:!0};n.extend({dir:function(a,b,c){for(var d=[],e=void 0!==c;(a=a[b])&&9!==a.nodeType;)if(1===a.nodeType){if(e&&n(a).is(c))break;d.push(a)}return d},sibling:function(a,b){for(var c=[];a;a=a.nextSibling)1===a.nodeType&&a!==b&&c.push(a);return c}}),n.fn.extend({has:function(a){var b=n(a,this),c=b.length;return this.filter(function(){for(var a=0;c>a;a++)if(n.contains(this,b[a]))return!0})},closest:function(a,b){for(var c,d=0,e=this.length,f=[],g=u.test(a)||"string"!=typeof a?n(a,b||this.context):0;e>d;d++)for(c=this[d];c&&c!==b;c=c.parentNode)if(c.nodeType<11&&(g?g.index(c)>-1:1===c.nodeType&&n.find.matchesSelector(c,a))){f.push(c);break}return this.pushStack(f.length>1?n.unique(f):f)},index:function(a){return a?"string"==typeof a?g.call(n(a),this[0]):g.call(this,a.jquery?a[0]:a):this[0]&&this[0].parentNode?this.first().prevAll().length:-1},add:function(a,b){return this.pushStack(n.unique(n.merge(this.get(),n(a,b))))},addBack:function(a){return this.add(null==a?this.prevObject:this.prevObject.filter(a))}}),n.each({parent:function(a){var b=a.parentNode;return b&&11!==b.nodeType?b:null},parents:function(a){return n.dir(a,"parentNode")},parentsUntil:function(a,b,c){return n.dir(a,"parentNode",c)},next:function(a){return D(a,"nextSibling")},prev:function(a){return D(a,"previousSibling")},nextAll:function(a){return n.dir(a,"nextSibling")},prevAll:function(a){return n.dir(a,"previousSibling")},nextUntil:function(a,b,c){return n.dir(a,"nextSibling",c)},prevUntil:function(a,b,c){return n.dir(a,"previousSibling",c)},siblings:function(a){return n.sibling((a.parentNode||{}).firstChild,a)},children:function(a){return n.sibling(a.firstChild)},contents:function(a){return a.contentDocument||n.merge([],a.childNodes)}},function(a,b){n.fn[a]=function(c,d){var e=n.map(this,b,c);return"Until"!==a.slice(-5)&&(d=c),d&&"string"==typeof d&&(e=n.filter(d,e)),this.length>1&&(C[a]||n.unique(e),B.test(a)&&e.reverse()),this.pushStack(e)}});var E=/\S+/g,F={};n.Callbacks=function(a){a="string"==typeof a?F[a]||G(a):n.extend({},a);var b,c,d,e,f,g,h=[],i=!a.once&&[],j=function(l){for(b=a.memory&&l,c=!0,g=e||0,e=0,f=h.length,d=!0;h&&f>g;g++)if(!1===h[g].apply(l[0],l[1])&&a.stopOnFalse){b=!1;break}d=!1,h&&(i?i.length&&j(i.shift()):b?h=[]:k.disable())},k={add:function(){if(h){var c=h.length;!function g(b){n.each(b,function(b,c){var d=n.type(c);"function"===d?a.unique&&k.has(c)||h.push(c):c&&c.length&&"string"!==d&&g(c)})}(arguments),d?f=h.length:b&&(e=c,j(b))}return this},remove:function(){return h&&n.each(arguments,function(a,b){for(var c;(c=n.inArray(b,h,c))>-1;)h.splice(c,1),d&&(f>=c&&f--,g>=c&&g--)}),this},has:function(a){return a?n.inArray(a,h)>-1:!(!h||!h.length)},empty:function(){return h=[],f=0,this},disable:function(){return h=i=b=void 0,this},disabled:function(){return!h},lock:function(){return i=void 0,b||k.disable(),this},locked:function(){return!i},fireWith:function(a,b){return!h||c&&!i||(b=b||[],b=[a,b.slice?b.slice():b],d?i.push(b):j(b)),this},fire:function(){return k.fireWith(this,arguments),this},fired:function(){return!!c}};return k},n.extend({Deferred:function(a){var b=[["resolve","done",n.Callbacks("once memory"),"resolved"],["reject","fail",n.Callbacks("once memory"),"rejected"],["notify","progress",n.Callbacks("memory")]],c="pending",d={state:function(){return c},always:function(){return e.done(arguments).fail(arguments),this},then:function(){var a=arguments;return n.Deferred(function(c){n.each(b,function(b,f){var g=n.isFunction(a[b])&&a[b];e[f[1]](function(){var a=g&&g.apply(this,arguments);a&&n.isFunction(a.promise)?a.promise().done(c.resolve).fail(c.reject).progress(c.notify):c[f[0]+"With"](this===d?c.promise():this,g?[a]:arguments)})}),a=null}).promise()},promise:function(a){return null!=a?n.extend(a,d):d}},e={};return d.pipe=d.then,n.each(b,function(a,f){var g=f[2],h=f[3];d[f[1]]=g.add,h&&g.add(function(){c=h},b[1^a][2].disable,b[2][2].lock),e[f[0]]=function(){return e[f[0]+"With"](this===e?d:this,arguments),this},e[f[0]+"With"]=g.fireWith}),d.promise(e),a&&a.call(e,e),e},when:function(a){var i,j,k,b=0,c=d.call(arguments),e=c.length,f=1!==e||a&&n.isFunction(a.promise)?e:0,g=1===f?a:n.Deferred(),h=function(a,b,c){return function(e){b[a]=this,c[a]=arguments.length>1?d.call(arguments):e,c===i?g.notifyWith(b,c):--f||g.resolveWith(b,c)}};if(e>1)for(i=new Array(e),j=new Array(e),k=new Array(e);e>b;b++)c[b]&&n.isFunction(c[b].promise)?c[b].promise().done(h(b,k,c)).fail(g.reject).progress(h(b,j,i)):--f;return f||g.resolveWith(k,c),g.promise()}});var H;n.fn.ready=function(a){return n.ready.promise().done(a),this},n.extend({isReady:!1,readyWait:1,holdReady:function(a){a?n.readyWait++:n.ready(!0)},ready:function(a){(!0===a?--n.readyWait:n.isReady)||(n.isReady=!0,!0!==a&&--n.readyWait>0||(H.resolveWith(l,[n]),n.fn.triggerHandler&&(n(l).triggerHandler("ready"),n(l).off("ready"))))}}),n.ready.promise=function(b){return H||(H=n.Deferred(),"complete"===l.readyState?setTimeout(n.ready):(l.addEventListener("DOMContentLoaded",I,!1),a.addEventListener("load",I,!1))),H.promise(b)},n.ready.promise();var J=n.access=function(a,b,c,d,e,f,g){var h=0,i=a.length,j=null==c;if("object"===n.type(c)){e=!0;for(h in c)n.access(a,b,h,c[h],!0,f,g)}else if(void 0!==d&&(e=!0,n.isFunction(d)||(g=!0),j&&(g?(b.call(a,d),b=null):(j=b,b=function(a,b,c){return j.call(n(a),c)})),b))for(;i>h;h++)b(a[h],c,g?d:d.call(a[h],h,b(a[h],c)));return e?a:j?b.call(a):i?b(a[0],c):f};n.acceptData=function(a){return 1===a.nodeType||9===a.nodeType||!+a.nodeType},K.uid=1,K.accepts=n.acceptData,K.prototype={key:function(a){if(!K.accepts(a))return 0;var b={},c=a[this.expando];if(!c){c=K.uid++;try{b[this.expando]={value:c},Object.defineProperties(a,b)}catch(d){b[this.expando]=c,n.extend(a,b)}}return this.cache[c]||(this.cache[c]={}),c},set:function(a,b,c){var d,e=this.key(a),f=this.cache[e];if("string"==typeof b)f[b]=c;else if(n.isEmptyObject(f))n.extend(this.cache[e],b);else for(d in b)f[d]=b[d];return f},get:function(a,b){var c=this.cache[this.key(a)];return void 0===b?c:c[b]},access:function(a,b,c){var d;return void 0===b||b&&"string"==typeof b&&void 0===c?(d=this.get(a,b),void 0!==d?d:this.get(a,n.camelCase(b))):(this.set(a,b,c),void 0!==c?c:b)},remove:function(a,b){var c,d,e,f=this.key(a),g=this.cache[f];if(void 0===b)this.cache[f]={};else{n.isArray(b)?d=b.concat(b.map(n.camelCase)):(e=n.camelCase(b),b in g?d=[b,e]:(d=e,d=d in g?[d]:d.match(E)||[])),c=d.length;for(;c--;)delete g[d[c]]}},hasData:function(a){return!n.isEmptyObject(this.cache[a[this.expando]]||{})},discard:function(a){a[this.expando]&&delete this.cache[a[this.expando]]}};var L=new K,M=new K,N=/^(?:\{[\w\W]*\}|\[[\w\W]*\])$/,O=/([A-Z])/g;n.extend({hasData:function(a){return M.hasData(a)||L.hasData(a)},data:function(a,b,c){return M.access(a,b,c)},removeData:function(a,b){M.remove(a,b)},_data:function(a,b,c){return L.access(a,b,c)},_removeData:function(a,b){L.remove(a,b)}}),n.fn.extend({data:function(a,b){var c,d,e,f=this[0],g=f&&f.attributes;if(void 0===a){if(this.length&&(e=M.get(f),1===f.nodeType&&!L.get(f,"hasDataAttrs"))){for(c=g.length;c--;)g[c]&&(d=g[c].name,0===d.indexOf("data-")&&(d=n.camelCase(d.slice(5)),P(f,d,e[d])));L.set(f,"hasDataAttrs",!0)}return e}return"object"==typeof a?this.each(function(){M.set(this,a)}):J(this,function(b){var c,d=n.camelCase(a);if(f&&void 0===b){if(void 0!==(c=M.get(f,a)))return c;if(void 0!==(c=M.get(f,d)))return c;if(void 0!==(c=P(f,d,void 0)))return c}else this.each(function(){var c=M.get(this,d);M.set(this,d,b),-1!==a.indexOf("-")&&void 0!==c&&M.set(this,a,b)})},null,b,arguments.length>1,null,!0)},removeData:function(a){return this.each(function(){M.remove(this,a)})}}),n.extend({queue:function(a,b,c){var d;return a?(b=(b||"fx")+"queue",d=L.get(a,b),c&&(!d||n.isArray(c)?d=L.access(a,b,n.makeArray(c)):d.push(c)),d||[]):void 0},dequeue:function(a,b){b=b||"fx";var c=n.queue(a,b),d=c.length,e=c.shift(),f=n._queueHooks(a,b),g=function(){n.dequeue(a,b)};"inprogress"===e&&(e=c.shift(),d--),e&&("fx"===b&&c.unshift("inprogress"),delete f.stop,e.call(a,g,f)),!d&&f&&f.empty.fire()},_queueHooks:function(a,b){var c=b+"queueHooks";return L.get(a,c)||L.access(a,c,{empty:n.Callbacks("once memory").add(function(){L.remove(a,[b+"queue",c])})})}}),n.fn.extend({queue:function(a,b){var c=2;return"string"!=typeof a&&(b=a,a="fx",c--),arguments.lengthx",k.noCloneChecked=!!b.cloneNode(!0).lastChild.defaultValue}();var U="undefined";k.focusinBubbles="onfocusin"in a;var V=/^key/,W=/^(?:mouse|pointer|contextmenu)|click/,X=/^(?:focusinfocus|focusoutblur)$/,Y=/^([^.]*)(?:\.(.+)|)$/;n.event={global:{},add:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.get(a);if(r)for(c.handler&&(f=c,c=f.handler,e=f.selector),c.guid||(c.guid=n.guid++),(i=r.events)||(i=r.events={}),(g=r.handle)||(g=r.handle=function(b){return typeof n!==U&&n.event.triggered!==b.type?n.event.dispatch.apply(a,arguments):void 0}),b=(b||"").match(E)||[""],j=b.length;j--;)h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o&&(l=n.event.special[o]||{},o=(e?l.delegateType:l.bindType)||o,l=n.event.special[o]||{},k=n.extend({type:o,origType:q,data:d,handler:c,guid:c.guid,selector:e,needsContext:e&&n.expr.match.needsContext.test(e),namespace:p.join(".")},f),(m=i[o])||(m=i[o]=[],m.delegateCount=0,l.setup&&!1!==l.setup.call(a,d,p,g)||a.addEventListener&&a.addEventListener(o,g,!1)),l.add&&(l.add.call(a,k),k.handler.guid||(k.handler.guid=c.guid)),e?m.splice(m.delegateCount++,0,k):m.push(k),n.event.global[o]=!0)},remove:function(a,b,c,d,e){var f,g,h,i,j,k,l,m,o,p,q,r=L.hasData(a)&&L.get(a);if(r&&(i=r.events)){for(b=(b||"").match(E)||[""],j=b.length;j--;)if(h=Y.exec(b[j])||[],o=q=h[1],p=(h[2]||"").split(".").sort(),o){for(l=n.event.special[o]||{},o=(d?l.delegateType:l.bindType)||o,m=i[o]||[],h=h[2]&&new RegExp("(^|\\.)"+p.join("\\.(?:.*\\.|)")+"(\\.|$)"),g=f=m.length;f--;)k=m[f],!e&&q!==k.origType||c&&c.guid!==k.guid||h&&!h.test(k.namespace)||d&&d!==k.selector&&("**"!==d||!k.selector)||(m.splice(f,1),k.selector&&m.delegateCount--,l.remove&&l.remove.call(a,k));g&&!m.length&&(l.teardown&&!1!==l.teardown.call(a,p,r.handle)||n.removeEvent(a,o,r.handle),delete i[o])}else for(o in i)n.event.remove(a,o+b[j],c,d,!0);n.isEmptyObject(i)&&(delete r.handle,L.remove(a,"events"))}},trigger:function(b,c,d,e){var f,g,h,i,k,m,o,p=[d||l],q=j.call(b,"type")?b.type:b,r=j.call(b,"namespace")?b.namespace.split("."):[];if(g=h=d=d||l,3!==d.nodeType&&8!==d.nodeType&&!X.test(q+n.event.triggered)&&(q.indexOf(".")>=0&&(r=q.split("."),q=r.shift(),r.sort()),k=q.indexOf(":")<0&&"on"+q,b=b[n.expando]?b:new n.Event(q,"object"==typeof b&&b),b.isTrigger=e?2:3,b.namespace=r.join("."),b.namespace_re=b.namespace?new RegExp("(^|\\.)"+r.join("\\.(?:.*\\.|)")+"(\\.|$)"):null,b.result=void 0,b.target||(b.target=d),c=null==c?[b]:n.makeArray(c,[b]),o=n.event.special[q]||{},e||!o.trigger||!1!==o.trigger.apply(d,c))){if(!e&&!o.noBubble&&!n.isWindow(d)){for(i=o.delegateType||q,X.test(i+q)||(g=g.parentNode);g;g=g.parentNode)p.push(g),h=g;h===(d.ownerDocument||l)&&p.push(h.defaultView||h.parentWindow||a)}for(f=0;(g=p[f++])&&!b.isPropagationStopped();)b.type=f>1?i:o.bindType||q,m=(L.get(g,"events")||{})[b.type]&&L.get(g,"handle"),m&&m.apply(g,c),(m=k&&g[k])&&m.apply&&n.acceptData(g)&&(b.result=m.apply(g,c),!1===b.result&&b.preventDefault());return b.type=q,e||b.isDefaultPrevented()||o._default&&!1!==o._default.apply(p.pop(),c)||!n.acceptData(d)||k&&n.isFunction(d[q])&&!n.isWindow(d)&&(h=d[k],h&&(d[k]=null),n.event.triggered=q,d[q](),n.event.triggered=void 0,h&&(d[k]=h)),b.result}},dispatch:function(a){a=n.event.fix(a);var b,c,e,f,g,h=[],i=d.call(arguments),j=(L.get(this,"events")||{})[a.type]||[],k=n.event.special[a.type]||{};if(i[0]=a,a.delegateTarget=this,!k.preDispatch||!1!==k.preDispatch.call(this,a)){for(h=n.event.handlers.call(this,a,j),b=0;(f=h[b++])&&!a.isPropagationStopped();)for(a.currentTarget=f.elem,c=0;(g=f.handlers[c++])&&!a.isImmediatePropagationStopped();)(!a.namespace_re||a.namespace_re.test(g.namespace))&&(a.handleObj=g,a.data=g.data,void 0!==(e=((n.event.special[g.origType]||{}).handle||g.handler).apply(f.elem,i))&&!1===(a.result=e)&&(a.preventDefault(),a.stopPropagation()));return k.postDispatch&&k.postDispatch.call(this,a),a.result}},handlers:function(a,b){var c,d,e,f,g=[],h=b.delegateCount,i=a.target;if(h&&i.nodeType&&(!a.button||"click"!==a.type))for(;i!==this;i=i.parentNode||this)if(!0!==i.disabled||"click"!==a.type){for(d=[],c=0;h>c;c++)f=b[c],e=f.selector+" ",void 0===d[e]&&(d[e]=f.needsContext?n(e,this).index(i)>=0:n.find(e,this,null,[i]).length),d[e]&&d.push(f);d.length&&g.push({elem:i,handlers:d})}return h]*)\/>/gi,bb=/<([\w:]+)/,cb=/<|&#?\w+;/,db=/<(?:script|style|link)/i,eb=/checked\s*(?:[^=]|=\s*.checked.)/i,fb=/^$|\/(?:java|ecma)script/i,gb=/^true\/(.*)/,ib={option:[1,""],thead:[1,"","
"],col:[2,"","
"],tr:[2,"","
"],td:[3,"","
"],_default:[0,"",""]};ib.optgroup=ib.option,ib.tbody=ib.tfoot=ib.colgroup=ib.caption=ib.thead,ib.th=ib.td,n.extend({clone:function(a,b,c){var d,e,f,g,h=a.cloneNode(!0),i=n.contains(a.ownerDocument,a);if(!(k.noCloneChecked||1!==a.nodeType&&11!==a.nodeType||n.isXMLDoc(a)))for(g=ob(h),f=ob(a),d=0,e=f.length;e>d;d++)pb(f[d],g[d]);if(b)if(c)for(f=f||ob(a),g=g||ob(h),d=0,e=f.length;e>d;d++)nb(f[d],g[d]);else nb(a,h);return g=ob(h,"script"),g.length>0&&mb(g,!i&&ob(a,"script")),h},buildFragment:function(a,b,c,d){for(var e,f,g,h,i,j,k=b.createDocumentFragment(),l=[],m=0,o=a.length;o>m;m++)if((e=a[m])||0===e)if("object"===n.type(e))n.merge(l,e.nodeType?[e]:e);else if(cb.test(e)){for(f=f||k.appendChild(b.createElement("div")),g=(bb.exec(e)||["",""])[1].toLowerCase(),h=ib[g]||ib._default,f.innerHTML=h[1]+e.replace(ab,"<$1>")+h[2],j=h[0];j--;)f=f.lastChild;n.merge(l,f.childNodes),f=k.firstChild,f.textContent=""}else l.push(b.createTextNode(e));for(k.textContent="",m=0;e=l[m++];)if((!d||-1===n.inArray(e,d))&&(i=n.contains(e.ownerDocument,e),f=ob(k.appendChild(e),"script"),i&&mb(f),c))for(j=0;e=f[j++];)fb.test(e.type||"")&&c.push(e);return k},cleanData:function(a){for(var b,c,d,e,f=n.event.special,g=0;void 0!==(c=a[g]);g++){if(n.acceptData(c)&&(e=c[L.expando])&&(b=L.cache[e])){if(b.events)for(d in b.events)f[d]?n.event.remove(c,d):n.removeEvent(c,d,b.handle);L.cache[e]&&delete L.cache[e]}delete M.cache[c[M.expando]]}}}),n.fn.extend({text:function(a){return J(this,function(a){return void 0===a?n.text(this):this.empty().each(function(){(1===this.nodeType||11===this.nodeType||9===this.nodeType)&&(this.textContent=a)})},null,a,arguments.length)},append:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){jb(this,a).appendChild(a)}})},prepend:function(){return this.domManip(arguments,function(a){if(1===this.nodeType||11===this.nodeType||9===this.nodeType){var b=jb(this,a);b.insertBefore(a,b.firstChild)}})},before:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this)})},after:function(){return this.domManip(arguments,function(a){this.parentNode&&this.parentNode.insertBefore(a,this.nextSibling)})},remove:function(a,b){for(var c,d=a?n.filter(a,this):this,e=0;null!=(c=d[e]);e++)b||1!==c.nodeType||n.cleanData(ob(c)),c.parentNode&&(b&&n.contains(c.ownerDocument,c)&&mb(ob(c,"script")),c.parentNode.removeChild(c));return this},empty:function(){for(var a,b=0;null!=(a=this[b]);b++)1===a.nodeType&&(n.cleanData(ob(a,!1)),a.textContent="");return this},clone:function(a,b){return a=null!=a&&a,b=null==b?a:b,this.map(function(){return n.clone(this,a,b)})},html:function(a){return J(this,function(a){var b=this[0]||{},c=0,d=this.length;if(void 0===a&&1===b.nodeType)return b.innerHTML;if("string"==typeof a&&!db.test(a)&&!ib[(bb.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(ab,"<$1>");try{for(;d>c;c++)b=this[c]||{},1===b.nodeType&&(n.cleanData(ob(b,!1)),b.innerHTML=a);b=0}catch(e){}}b&&this.empty().append(a)},null,a,arguments.length)},replaceWith:function(){var a=arguments[0];return this.domManip(arguments,function(b){a=this.parentNode,n.cleanData(ob(this)),a&&a.replaceChild(b,this)}),a&&(a.length||a.nodeType)?this:this.remove()},detach:function(a){return this.remove(a,!0)},domManip:function(a,b){a=e.apply([],a);var c,d,f,g,h,i,j=0,l=this.length,m=this,o=l-1,p=a[0],q=n.isFunction(p);if(q||l>1&&"string"==typeof p&&!k.checkClone&&eb.test(p))return this.each(function(c){var d=m.eq(c);q&&(a[0]=p.call(this,c,d.html())),d.domManip(a,b)});if(l&&(c=n.buildFragment(a,this[0].ownerDocument,!1,this),d=c.firstChild,1===c.childNodes.length&&(c=d),d)){for(f=n.map(ob(c,"script"),kb),g=f.length;l>j;j++)h=c,j!==o&&(h=n.clone(h,!0,!0),g&&n.merge(f,ob(h,"script"))),b.call(this[j],h,j);if(g)for(i=f[f.length-1].ownerDocument,n.map(f,lb),j=0;g>j;j++)h=f[j],fb.test(h.type||"")&&!L.access(h,"globalEval")&&n.contains(i,h)&&(h.src?n._evalUrl&&n._evalUrl(h.src):n.globalEval(h.textContent.replace(/^\s*\s*$/g,"")))}return this}}),n.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){n.fn[a]=function(a){for(var c,d=[],e=n(a),g=e.length-1,h=0;g>=h;h++)c=h===g?this:this.clone(!0),n(e[h])[b](c),f.apply(d,c.get());return this.pushStack(d)}});var qb,rb={},ub=/^margin/,vb=new RegExp("^("+Q+")(?!px)[a-z%]+$","i"),wb=function(a){return a.ownerDocument.defaultView.getComputedStyle(a,null)};!function(){function g(){f.style.cssText="-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;display:block;margin-top:1%;top:1%;border:1px;padding:1px;width:4px;position:absolute",f.innerHTML="",d.appendChild(e);var g=a.getComputedStyle(f,null);b="1%"!==g.top,c="4px"===g.width,d.removeChild(e)}var b,c,d=l.documentElement,e=l.createElement("div"),f=l.createElement("div");f.style&&(f.style.backgroundClip="content-box",f.cloneNode(!0).style.backgroundClip="",k.clearCloneStyle="content-box"===f.style.backgroundClip,e.style.cssText="border:0;width:0;height:0;top:0;left:-9999px;margin-top:1px;position:absolute",e.appendChild(f),a.getComputedStyle&&n.extend(k,{pixelPosition:function(){return g(),b},boxSizingReliable:function(){return null==c&&g(),c},reliableMarginRight:function(){var b,c=f.appendChild(l.createElement("div"));return c.style.cssText=f.style.cssText="-webkit-box-sizing:content-box;-moz-box-sizing:content-box;box-sizing:content-box;display:block;margin:0;border:0;padding:0",c.style.marginRight=c.style.width="0",f.style.width="1px",d.appendChild(e),b=!parseFloat(a.getComputedStyle(c,null).marginRight),d.removeChild(e),b}}))}(),n.swap=function(a,b,c,d){var e,f,g={};for(f in b)g[f]=a.style[f],a.style[f]=b[f];e=c.apply(a,d||[]);for(f in b)a.style[f]=g[f];return e};var zb=/^(none|table(?!-c[ea]).+)/,Ab=new RegExp("^("+Q+")(.*)$","i"),Bb=new RegExp("^([+-])=("+Q+")","i"),Cb={position:"absolute",visibility:"hidden",display:"block"},Db={letterSpacing:"0",fontWeight:"400"},Eb=["Webkit","O","Moz","ms"];n.extend({cssHooks:{opacity:{get:function(a,b){if(b){var c=xb(a,"opacity");return""===c?"1":c}}}},cssNumber:{columnCount:!0,fillOpacity:!0,flexGrow:!0,flexShrink:!0,fontWeight:!0,lineHeight:!0,opacity:!0,order:!0,orphans:!0,widows:!0,zIndex:!0,zoom:!0},cssProps:{float:"cssFloat"},style:function(a,b,c,d){if(a&&3!==a.nodeType&&8!==a.nodeType&&a.style){var e,f,g,h=n.camelCase(b),i=a.style;return b=n.cssProps[h]||(n.cssProps[h]=Fb(i,h)),g=n.cssHooks[b]||n.cssHooks[h],void 0===c?g&&"get"in g&&void 0!==(e=g.get(a,!1,d))?e:i[b]:(f=typeof c,"string"===f&&(e=Bb.exec(c))&&(c=(e[1]+1)*e[2]+parseFloat(n.css(a,b)),f="number"),void(null!=c&&c===c&&("number"!==f||n.cssNumber[h]||(c+="px"),k.clearCloneStyle||""!==c||0!==b.indexOf("background")||(i[b]="inherit"),g&&"set"in g&&void 0===(c=g.set(a,c,d))||(i[b]=c))))}},css:function(a,b,c,d){var e,f,g,h=n.camelCase(b);return b=n.cssProps[h]||(n.cssProps[h]=Fb(a.style,h)),g=n.cssHooks[b]||n.cssHooks[h],g&&"get"in g&&(e=g.get(a,!0,c)),void 0===e&&(e=xb(a,b,d)),"normal"===e&&b in Db&&(e=Db[b]),""===c||c?(f=parseFloat(e),!0===c||n.isNumeric(f)?f||0:e):e}}),n.each(["height","width"],function(a,b){n.cssHooks[b]={get:function(a,c,d){return c?zb.test(n.css(a,"display"))&&0===a.offsetWidth?n.swap(a,Cb,function(){return Ib(a,b,d)}):Ib(a,b,d):void 0},set:function(a,c,d){var e=d&&wb(a);return Gb(a,c,d?Hb(a,b,d,"border-box"===n.css(a,"boxSizing",!1,e),e):0)}}}),n.cssHooks.marginRight=yb(k.reliableMarginRight,function(a,b){return b?n.swap(a,{display:"inline-block"},xb,[a,"marginRight"]):void 0}),n.each({margin:"",padding:"",border:"Width"},function(a,b){n.cssHooks[a+b]={expand:function(c){for(var d=0,e={},f="string"==typeof c?c.split(" "):[c];4>d;d++)e[a+R[d]+b]=f[d]||f[d-2]||f[0];return e}},ub.test(a)||(n.cssHooks[a+b].set=Gb)}),n.fn.extend({css:function(a,b){return J(this,function(a,b,c){var d,e,f={},g=0;if(n.isArray(b)){for(d=wb(a),e=b.length;e>g;g++)f[b[g]]=n.css(a,b[g],!1,d);return f}return void 0!==c?n.style(a,b,c):n.css(a,b)},a,b,arguments.length>1)},show:function(){return Jb(this,!0)},hide:function(){return Jb(this)},toggle:function(a){return"boolean"==typeof a?a?this.show():this.hide():this.each(function(){S(this)?n(this).show():n(this).hide()})}}),n.Tween=Kb,Kb.prototype={constructor:Kb,init:function(a,b,c,d,e,f){this.elem=a,this.prop=c,this.easing=e||"swing",this.options=b,this.start=this.now=this.cur(),this.end=d,this.unit=f||(n.cssNumber[c]?"":"px")},cur:function(){var a=Kb.propHooks[this.prop];return a&&a.get?a.get(this):Kb.propHooks._default.get(this)},run:function(a){var b,c=Kb.propHooks[this.prop];return this.pos=b=this.options.duration?n.easing[this.easing](a,this.options.duration*a,0,1,this.options.duration):a,this.now=(this.end-this.start)*b+this.start,this.options.step&&this.options.step.call(this.elem,this.now,this),c&&c.set?c.set(this):Kb.propHooks._default.set(this),this}},Kb.prototype.init.prototype=Kb.prototype,Kb.propHooks={_default:{get:function(a){var b;return null==a.elem[a.prop]||a.elem.style&&null!=a.elem.style[a.prop]?(b=n.css(a.elem,a.prop,""),b&&"auto"!==b?b:0):a.elem[a.prop]},set:function(a){n.fx.step[a.prop]?n.fx.step[a.prop](a):a.elem.style&&(null!=a.elem.style[n.cssProps[a.prop]]||n.cssHooks[a.prop])?n.style(a.elem,a.prop,a.now+a.unit):a.elem[a.prop]=a.now}}},Kb.propHooks.scrollTop=Kb.propHooks.scrollLeft={set:function(a){a.elem.nodeType&&a.elem.parentNode&&(a.elem[a.prop]=a.now)}},n.easing={linear:function(a){return a},swing:function(a){return.5-Math.cos(a*Math.PI)/2}},n.fx=Kb.prototype.init,n.fx.step={};var Lb,Mb,Nb=/^(?:toggle|show|hide)$/,Ob=new RegExp("^(?:([+-])=|)("+Q+")([a-z%]*)$","i"),Pb=/queueHooks$/,Qb=[Vb],Rb={"*":[function(a,b){var c=this.createTween(a,b),d=c.cur(),e=Ob.exec(b),f=e&&e[3]||(n.cssNumber[a]?"":"px"),g=(n.cssNumber[a]||"px"!==f&&+d)&&Ob.exec(n.css(c.elem,a)),h=1,i=20;if(g&&g[3]!==f){f=f||g[3],e=e||[],g=+d||1;do{h=h||".5",g/=h,n.style(c.elem,a,g+f)}while(h!==(h=c.cur()/d)&&1!==h&&--i)}return e&&(g=c.start=+g||+d||0,c.unit=f,c.end=e[1]?g+(e[1]+1)*e[2]:+e[2]),c}]};n.Animation=n.extend(Xb,{tweener:function(a,b){n.isFunction(a)?(b=a,a=["*"]):a=a.split(" ");for(var c,d=0,e=a.length;e>d;d++)c=a[d],Rb[c]=Rb[c]||[],Rb[c].unshift(b)},prefilter:function(a,b){b?Qb.unshift(a):Qb.push(a)}}),n.speed=function(a,b,c){var d=a&&"object"==typeof a?n.extend({},a):{complete:c||!c&&b||n.isFunction(a)&&a,duration:a,easing:c&&b||b&&!n.isFunction(b)&&b};return d.duration=n.fx.off?0:"number"==typeof d.duration?d.duration:d.duration in n.fx.speeds?n.fx.speeds[d.duration]:n.fx.speeds._default,(null==d.queue||!0===d.queue)&&(d.queue="fx"),d.old=d.complete,d.complete=function(){n.isFunction(d.old)&&d.old.call(this),d.queue&&n.dequeue(this,d.queue)},d},n.fn.extend({fadeTo:function(a,b,c,d){return this.filter(S).css("opacity",0).show().end().animate({opacity:b},a,c,d)},animate:function(a,b,c,d){var e=n.isEmptyObject(a),f=n.speed(b,c,d),g=function(){var b=Xb(this,n.extend({},a),f);(e||L.get(this,"finish"))&&b.stop(!0)};return g.finish=g,e||!1===f.queue?this.each(g):this.queue(f.queue,g)},stop:function(a,b,c){var d=function(a){var b=a.stop;delete a.stop,b(c)};return"string"!=typeof a&&(c=b,b=a,a=void 0),b&&!1!==a&&this.queue(a||"fx",[]),this.each(function(){var b=!0,e=null!=a&&a+"queueHooks",f=n.timers,g=L.get(this);if(e)g[e]&&g[e].stop&&d(g[e]);else for(e in g)g[e]&&g[e].stop&&Pb.test(e)&&d(g[e]);for(e=f.length;e--;)f[e].elem!==this||null!=a&&f[e].queue!==a||(f[e].anim.stop(c),b=!1,f.splice(e,1));(b||!c)&&n.dequeue(this,a)})},finish:function(a){return!1!==a&&(a=a||"fx"),this.each(function(){var b,c=L.get(this),d=c[a+"queue"],e=c[a+"queueHooks"],f=n.timers,g=d?d.length:0;for(c.finish=!0,n.queue(this,a,[]),e&&e.stop&&e.stop.call(this,!0),b=f.length;b--;)f[b].elem===this&&f[b].queue===a&&(f[b].anim.stop(!0),f.splice(b,1));for(b=0;g>b;b++)d[b]&&d[b].finish&&d[b].finish.call(this);delete c.finish})}}),n.each(["toggle","show","hide"],function(a,b){var c=n.fn[b];n.fn[b]=function(a,d,e){ return null==a||"boolean"==typeof a?c.apply(this,arguments):this.animate(Tb(b,!0),a,d,e)}}),n.each({slideDown:Tb("show"),slideUp:Tb("hide"),slideToggle:Tb("toggle"),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"},fadeToggle:{opacity:"toggle"}},function(a,b){n.fn[a]=function(a,c,d){return this.animate(b,a,c,d)}}),n.timers=[],n.fx.tick=function(){var a,b=0,c=n.timers;for(Lb=n.now();b1)},removeAttr:function(a){return this.each(function(){n.removeAttr(this,a)})}}),n.extend({attr:function(a,b,c){var d,e,f=a.nodeType;if(a&&3!==f&&8!==f&&2!==f)return typeof a.getAttribute===U?n.prop(a,b,c):(1===f&&n.isXMLDoc(a)||(b=b.toLowerCase(),d=n.attrHooks[b]||(n.expr.match.bool.test(b)?Zb:void 0)),void 0===c?d&&"get"in d&&null!==(e=d.get(a,b))?e:(e=n.find.attr(a,b),null==e?void 0:e):null!==c?d&&"set"in d&&void 0!==(e=d.set(a,c,b))?e:(a.setAttribute(b,c+""),c):void n.removeAttr(a,b))},removeAttr:function(a,b){var c,d,e=0,f=b&&b.match(E);if(f&&1===a.nodeType)for(;c=f[e++];)d=n.propFix[c]||c,n.expr.match.bool.test(c)&&(a[d]=!1),a.removeAttribute(c)},attrHooks:{type:{set:function(a,b){if(!k.radioValue&&"radio"===b&&n.nodeName(a,"input")){var c=a.value;return a.setAttribute("type",b),c&&(a.value=c),b}}}}}),Zb={set:function(a,b,c){return!1===b?n.removeAttr(a,c):a.setAttribute(c,c),c}},n.each(n.expr.match.bool.source.match(/\w+/g),function(a,b){var c=$b[b]||n.find.attr;$b[b]=function(a,b,d){var e,f;return d||(f=$b[b],$b[b]=e,e=null!=c(a,b,d)?b.toLowerCase():null,$b[b]=f),e}});var _b=/^(?:input|select|textarea|button)$/i;n.fn.extend({prop:function(a,b){return J(this,n.prop,a,b,arguments.length>1)},removeProp:function(a){return this.each(function(){delete this[n.propFix[a]||a]})}}),n.extend({propFix:{for:"htmlFor",class:"className"},prop:function(a,b,c){var d,e,f,g=a.nodeType;if(a&&3!==g&&8!==g&&2!==g)return f=1!==g||!n.isXMLDoc(a),f&&(b=n.propFix[b]||b,e=n.propHooks[b]),void 0!==c?e&&"set"in e&&void 0!==(d=e.set(a,c,b))?d:a[b]=c:e&&"get"in e&&null!==(d=e.get(a,b))?d:a[b]},propHooks:{tabIndex:{get:function(a){return a.hasAttribute("tabindex")||_b.test(a.nodeName)||a.href?a.tabIndex:-1}}}}),k.optSelected||(n.propHooks.selected={get:function(a){var b=a.parentNode;return b&&b.parentNode&&b.parentNode.selectedIndex,null}}),n.each(["tabIndex","readOnly","maxLength","cellSpacing","cellPadding","rowSpan","colSpan","useMap","frameBorder","contentEditable"],function(){n.propFix[this.toLowerCase()]=this});var ac=/[\t\r\n\f]/g;n.fn.extend({addClass:function(a){var b,c,d,e,f,g,h="string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).addClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):" ")){for(f=0;e=b[f++];)d.indexOf(" "+e+" ")<0&&(d+=e+" ");g=n.trim(d),c.className!==g&&(c.className=g)}return this},removeClass:function(a){var b,c,d,e,f,g,h=0===arguments.length||"string"==typeof a&&a,i=0,j=this.length;if(n.isFunction(a))return this.each(function(b){n(this).removeClass(a.call(this,b,this.className))});if(h)for(b=(a||"").match(E)||[];j>i;i++)if(c=this[i],d=1===c.nodeType&&(c.className?(" "+c.className+" ").replace(ac," "):"")){for(f=0;e=b[f++];)for(;d.indexOf(" "+e+" ")>=0;)d=d.replace(" "+e+" "," ");g=a?n.trim(d):"",c.className!==g&&(c.className=g)}return this},toggleClass:function(a,b){var c=typeof a;return"boolean"==typeof b&&"string"===c?b?this.addClass(a):this.removeClass(a):this.each(n.isFunction(a)?function(c){n(this).toggleClass(a.call(this,c,this.className,b),b)}:function(){if("string"===c)for(var b,d=0,e=n(this),f=a.match(E)||[];b=f[d++];)e.hasClass(b)?e.removeClass(b):e.addClass(b);else(c===U||"boolean"===c)&&(this.className&&L.set(this,"__className__",this.className),this.className=this.className||!1===a?"":L.get(this,"__className__")||"")})},hasClass:function(a){for(var b=" "+a+" ",c=0,d=this.length;d>c;c++)if(1===this[c].nodeType&&(" "+this[c].className+" ").replace(ac," ").indexOf(b)>=0)return!0;return!1}});n.fn.extend({val:function(a){var b,c,d,e=this[0];return arguments.length?(d=n.isFunction(a),this.each(function(c){var e;1===this.nodeType&&(e=d?a.call(this,c,n(this).val()):a,null==e?e="":"number"==typeof e?e+="":n.isArray(e)&&(e=n.map(e,function(a){return null==a?"":a+""})),(b=n.valHooks[this.type]||n.valHooks[this.nodeName.toLowerCase()])&&"set"in b&&void 0!==b.set(this,e,"value")||(this.value=e))})):e?(b=n.valHooks[e.type]||n.valHooks[e.nodeName.toLowerCase()],b&&"get"in b&&void 0!==(c=b.get(e,"value"))?c:(c=e.value,"string"==typeof c?c.replace(/\r/g,""):null==c?"":c)):void 0}}),n.extend({valHooks:{option:{get:function(a){var b=n.find.attr(a,"value");return null!=b?b:n.trim(n.text(a))}},select:{get:function(a){for(var b,c,d=a.options,e=a.selectedIndex,f="select-one"===a.type||0>e,g=f?null:[],h=f?e+1:d.length,i=0>e?h:f?e:0;h>i;i++)if(c=d[i],!(!c.selected&&i!==e||(k.optDisabled?c.disabled:null!==c.getAttribute("disabled"))||c.parentNode.disabled&&n.nodeName(c.parentNode,"optgroup"))){if(b=n(c).val(),f)return b;g.push(b)}return g},set:function(a,b){for(var c,d,e=a.options,f=n.makeArray(b),g=e.length;g--;)d=e[g],(d.selected=n.inArray(d.value,f)>=0)&&(c=!0);return c||(a.selectedIndex=-1),f}}}}),n.each(["radio","checkbox"],function(){n.valHooks[this]={set:function(a,b){return n.isArray(b)?a.checked=n.inArray(n(a).val(),b)>=0:void 0}},k.checkOn||(n.valHooks[this].get=function(a){return null===a.getAttribute("value")?"on":a.value})}),n.each("blur focus focusin focusout load resize scroll unload click dblclick mousedown mouseup mousemove mouseover mouseout mouseenter mouseleave change select submit keydown keypress keyup error contextmenu".split(" "),function(a,b){n.fn[b]=function(a,c){return arguments.length>0?this.on(b,null,a,c):this.trigger(b)}}),n.fn.extend({hover:function(a,b){return this.mouseenter(a).mouseleave(b||a)},bind:function(a,b,c){return this.on(a,null,b,c)},unbind:function(a,b){return this.off(a,null,b)},delegate:function(a,b,c,d){return this.on(b,a,c,d)},undelegate:function(a,b,c){return 1===arguments.length?this.off(a,"**"):this.off(b,a||"**",c)}});var cc=n.now(),dc=/\?/;n.parseJSON=function(a){return JSON.parse(a+"")},n.parseXML=function(a){var b,c;if(!a||"string"!=typeof a)return null;try{c=new DOMParser,b=c.parseFromString(a,"text/xml")}catch(d){b=void 0}return(!b||b.getElementsByTagName("parsererror").length)&&n.error("Invalid XML: "+a),b};var ec,fc,hc=/([?&])_=[^&]*/,ic=/^(.*?):[ \t]*([^\r\n]*)$/gm,jc=/^(?:about|app|app-storage|.+-extension|file|res|widget):$/,kc=/^(?:GET|HEAD)$/,mc=/^([\w.+-]+:)(?:\/\/(?:[^\/?#]*@|)([^\/?#:]*)(?::(\d+)|)|)/,nc={},oc={},pc="*/".concat("*");try{fc=location.href}catch(qc){fc=l.createElement("a"),fc.href="",fc=fc.href}ec=mc.exec(fc.toLowerCase())||[],n.extend({active:0,lastModified:{},etag:{},ajaxSettings:{url:fc,type:"GET",isLocal:jc.test(ec[1]),global:!0,processData:!0,async:!0,contentType:"application/x-www-form-urlencoded; charset=UTF-8",accepts:{"*":pc,text:"text/plain",html:"text/html",xml:"application/xml, text/xml",json:"application/json, text/javascript"},contents:{xml:/xml/,html:/html/,json:/json/},responseFields:{xml:"responseXML",text:"responseText",json:"responseJSON"},converters:{"* text":String,"text html":!0,"text json":n.parseJSON,"text xml":n.parseXML},flatOptions:{url:!0,context:!0}},ajaxSetup:function(a,b){return b?tc(tc(a,n.ajaxSettings),b):tc(n.ajaxSettings,a)},ajaxPrefilter:rc(nc),ajaxTransport:rc(oc),ajax:function(a,b){function x(a,b,f,h){var j,r,s,u,w,x=b;2!==t&&(t=2,g&&clearTimeout(g),c=void 0,e=h||"",v.readyState=a>0?4:0,j=a>=200&&300>a||304===a,f&&(u=uc(k,v,f)),u=vc(k,u,v,j),j?(k.ifModified&&(w=v.getResponseHeader("Last-Modified"),w&&(n.lastModified[d]=w),(w=v.getResponseHeader("etag"))&&(n.etag[d]=w)),204===a||"HEAD"===k.type?x="nocontent":304===a?x="notmodified":(x=u.loadingState,r=u.data,s=u.error,j=!s)):(s=x,(a||!x)&&(x="error",0>a&&(a=0))),v.status=a,v.statusText=(b||x)+"",j?o.resolveWith(l,[r,x,v]):o.rejectWith(l,[v,x,s]),v.statusCode(q),q=void 0,i&&m.trigger(j?"ajaxSuccess":"ajaxError",[v,k,j?r:s]),p.fireWith(l,[v,x]),i&&(m.trigger("ajaxComplete",[v,k]),--n.active||n.event.trigger("ajaxStop")))}"object"==typeof a&&(b=a,a=void 0),b=b||{};var c,d,e,f,g,h,i,j,k=n.ajaxSetup({},b),l=k.context||k,m=k.context&&(l.nodeType||l.jquery)?n(l):n.event,o=n.Deferred(),p=n.Callbacks("once memory"),q=k.statusCode||{},r={},s={},t=0,u="canceled",v={readyState:0,getResponseHeader:function(a){var b;if(2===t){if(!f)for(f={};b=ic.exec(e);)f[b[1].toLowerCase()]=b[2];b=f[a.toLowerCase()]}return null==b?null:b},getAllResponseHeaders:function(){return 2===t?e:null},setRequestHeader:function(a,b){var c=a.toLowerCase();return t||(a=s[c]=s[c]||a,r[a]=b),this},overrideMimeType:function(a){return t||(k.mimeType=a),this},statusCode:function(a){var b;if(a)if(2>t)for(b in a)q[b]=[q[b],a[b]];else v.always(a[v.status]);return this},abort:function(a){var b=a||u;return c&&c.abort(b),x(0,b),this}};if(o.promise(v).complete=p.add,v.success=v.done,v.error=v.fail,k.url=((a||k.url||fc)+"").replace(/#.*$/,"").replace(/^\/\//,ec[1]+"//"),k.type=b.method||b.type||k.method||k.type,k.dataTypes=n.trim(k.dataType||"*").toLowerCase().match(E)||[""],null==k.crossDomain&&(h=mc.exec(k.url.toLowerCase()),k.crossDomain=!(!h||h[1]===ec[1]&&h[2]===ec[2]&&(h[3]||("http:"===h[1]?"80":"443"))===(ec[3]||("http:"===ec[1]?"80":"443")))),k.data&&k.processData&&"string"!=typeof k.data&&(k.data=n.param(k.data,k.traditional)),sc(nc,k,b,v),2===t)return v;i=k.global,i&&0==n.active++&&n.event.trigger("ajaxStart"),k.type=k.type.toUpperCase(),k.hasContent=!kc.test(k.type),d=k.url,k.hasContent||(k.data&&(d=k.url+=(dc.test(d)?"&":"?")+k.data,delete k.data),!1===k.cache&&(k.url=hc.test(d)?d.replace(hc,"$1_="+cc++):d+(dc.test(d)?"&":"?")+"_="+cc++)),k.ifModified&&(n.lastModified[d]&&v.setRequestHeader("If-Modified-Since",n.lastModified[d]),n.etag[d]&&v.setRequestHeader("If-None-Match",n.etag[d])),(k.data&&k.hasContent&&!1!==k.contentType||b.contentType)&&v.setRequestHeader("Content-Type",k.contentType),v.setRequestHeader("Accept",k.dataTypes[0]&&k.accepts[k.dataTypes[0]]?k.accepts[k.dataTypes[0]]+("*"!==k.dataTypes[0]?", "+pc+"; q=0.01":""):k.accepts["*"]);for(j in k.headers)v.setRequestHeader(j,k.headers[j]);if(k.beforeSend&&(!1===k.beforeSend.call(l,v,k)||2===t))return v.abort();u="abort";for(j in{success:1,error:1,complete:1})v[j](k[j]);if(c=sc(oc,k,b,v)){v.readyState=1,i&&m.trigger("ajaxSend",[v,k]),k.async&&k.timeout>0&&(g=setTimeout(function(){v.abort("timeout")},k.timeout));try{t=1,c.send(r,x)}catch(w){if(!(2>t))throw w;x(-1,w)}}else x(-1,"No Transport");return v},getJSON:function(a,b,c){return n.get(a,b,c,"json")},getScript:function(a,b){return n.get(a,void 0,b,"script")}}),n.each(["get","post"],function(a,b){n[b]=function(a,c,d,e){return n.isFunction(c)&&(e=e||d,d=c,c=void 0),n.ajax({url:a,type:b,dataType:e,data:c,success:d})}}),n.each(["ajaxStart","ajaxStop","ajaxComplete","ajaxError","ajaxSuccess","ajaxSend"],function(a,b){n.fn[b]=function(a){return this.on(b,a)}}),n._evalUrl=function(a){return n.ajax({url:a,type:"GET",dataType:"script",async:!1,global:!1,throws:!0})},n.fn.extend({wrapAll:function(a){var b;return n.isFunction(a)?this.each(function(b){n(this).wrapAll(a.call(this,b))}):(this[0]&&(b=n(a,this[0].ownerDocument).eq(0).clone(!0),this[0].parentNode&&b.insertBefore(this[0]),b.map(function(){for(var a=this;a.firstElementChild;)a=a.firstElementChild;return a}).append(this)),this)},wrapInner:function(a){return this.each(n.isFunction(a)?function(b){n(this).wrapInner(a.call(this,b))}:function(){var b=n(this),c=b.contents();c.length?c.wrapAll(a):b.append(a)})},wrap:function(a){var b=n.isFunction(a);return this.each(function(c){n(this).wrapAll(b?a.call(this,c):a)})},unwrap:function(){return this.parent().each(function(){n.nodeName(this,"body")||n(this).replaceWith(this.childNodes)}).end()}}),n.expr.filters.hidden=function(a){return a.offsetWidth<=0&&a.offsetHeight<=0},n.expr.filters.visible=function(a){return!n.expr.filters.hidden(a)};var xc=/\[\]$/,zc=/^(?:submit|button|image|reset|file)$/i,Ac=/^(?:input|select|textarea|keygen)/i;n.param=function(a,b){var c,d=[],e=function(a,b){b=n.isFunction(b)?b():null==b?"":b,d[d.length]=encodeURIComponent(a)+"="+encodeURIComponent(b)};if(void 0===b&&(b=n.ajaxSettings&&n.ajaxSettings.traditional),n.isArray(a)||a.jquery&&!n.isPlainObject(a))n.each(a,function(){e(this.name,this.value)});else for(c in a)Bc(c,a[c],b,e);return d.join("&").replace(/%20/g,"+")},n.fn.extend({serialize:function(){return n.param(this.serializeArray())},serializeArray:function(){return this.map(function(){var a=n.prop(this,"elements");return a?n.makeArray(a):this}).filter(function(){var a=this.type;return this.name&&!n(this).is(":disabled")&&Ac.test(this.nodeName)&&!zc.test(a)&&(this.checked||!T.test(a))}).map(function(a,b){var c=n(this).val();return null==c?null:n.isArray(c)?n.map(c,function(a){return{name:b.name,value:a.replace(/\r?\n/g,"\r\n")}}):{name:b.name,value:c.replace(/\r?\n/g,"\r\n")}}).get()}}),n.ajaxSettings.xhr=function(){try{return new XMLHttpRequest}catch(a){}};var Cc=0,Dc={},Ec={0:200,1223:204},Fc=n.ajaxSettings.xhr();a.ActiveXObject&&n(a).on("unload",function(){for(var a in Dc)Dc[a]()}),k.cors=!!Fc&&"withCredentials"in Fc,k.ajax=Fc=!!Fc,n.ajaxTransport(function(a){var b;return k.cors||Fc&&!a.crossDomain?{send:function(c,d){var e,f=a.xhr(),g=++Cc;if(f.open(a.type,a.url,a.async,a.username,a.password),a.xhrFields)for(e in a.xhrFields)f[e]=a.xhrFields[e];a.mimeType&&f.overrideMimeType&&f.overrideMimeType(a.mimeType),a.crossDomain||c["X-Requested-With"]||(c["X-Requested-With"]="XMLHttpRequest");for(e in c)f.setRequestHeader(e,c[e]);b=function(a){return function(){b&&(delete Dc[g],b=f.onload=f.onerror=null,"abort"===a?f.abort():"error"===a?d(f.status,f.statusText):d(Ec[f.status]||f.status,f.statusText,"string"==typeof f.responseText?{text:f.responseText}:void 0,f.getAllResponseHeaders()))}},f.onload=b(),f.onerror=b("error"),b=Dc[g]=b("abort");try{f.send(a.hasContent&&a.data||null)}catch(h){if(b)throw h}},abort:function(){b&&b()}}:void 0}),n.ajaxSetup({accepts:{script:"text/javascript, application/javascript, application/ecmascript, application/x-ecmascript"},contents:{script:/(?:java|ecma)script/},converters:{"text script":function(a){return n.globalEval(a),a}}}),n.ajaxPrefilter("script",function(a){void 0===a.cache&&(a.cache=!1),a.crossDomain&&(a.type="GET")}),n.ajaxTransport("script",function(a){if(a.crossDomain){var b,c;return{send:function(d,e){b=n(" - + Node link From ad30a5ef88ba501a402dd93bb4355d2d78a01aa9 Mon Sep 17 00:00:00 2001 From: alkadi-mh Date: Wed, 2 Jun 2021 00:27:31 -0700 Subject: [PATCH 07/26] visWeb lib --- index.html | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index d9620b5..f44b480 100644 --- a/index.html +++ b/index.html @@ -25,7 +25,9 @@ - + + + Node link From b214f77a30d276180727fbd1c4f375bb4a65d829 Mon Sep 17 00:00:00 2001 From: bbach Date: Wed, 2 Jun 2021 15:31:30 +0100 Subject: [PATCH 08/26] add link direction to map --- index.html | 2 +- src/map.ts | 28 ++++++++++++++++++++++++++++ 2 files changed, 29 insertions(+), 1 deletion(-) diff --git a/index.html b/index.html index 7541b68..d9620b5 100644 --- a/index.html +++ b/index.html @@ -25,7 +25,7 @@ - + Node link diff --git a/src/map.ts b/src/map.ts index 9044214..58f8969 100644 --- a/src/map.ts +++ b/src/map.ts @@ -335,6 +335,17 @@ function init() { .on('mouseout', (d: any) => { messenger.highlight('reset') }) + .attr('marker-end',function (d: any) { + if(d.directed){ + var color = utils.getPriorityColor(d); + if(!color) + color = COLOR_DEFAULT_LINK; + // if(highlightId && highlightId == d._id) { + // return 'black'; + // } + return marker(color); + } + }) // DRAW NODES (one for every node x position it is at) @@ -756,6 +767,23 @@ function updateLinks(highlightId?: number) { } +function marker(color: any) +{ + svg.append("svg:defs").append("svg:marker") + .attr("id", color.replace("#", "")) + .attr("viewBox", "0 -5 10 10") + .attr("refX", 12) + .attr("refY", 0) + .attr("markerWidth", 6) + .attr("markerHeight", 6) + .attr("orient", "auto") //auto-start-reverse to flip + .append("svg:path") + .attr("d", "M0,-5L10,0L0,5") + .style("fill", color); + + return "url(" + color + ")"; +}; + var visibleLabels: any[] = [] function updateNodes(highlightId?: number) { From 5092897020b0da49c68720bfdd19167be3db8bd6 Mon Sep 17 00:00:00 2001 From: alkadi-mh Date: Thu, 24 Jun 2021 19:13:57 -0700 Subject: [PATCH 09/26] mandtory logging --- static/traces/trace.js | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/static/traces/trace.js b/static/traces/trace.js index 8219e61..9fab61c 100644 --- a/static/traces/trace.js +++ b/static/traces/trace.js @@ -38,7 +38,7 @@ trace.debug = function(d) { if (!arguments.length) return debug; - debug = d; + // debug = d; return trace; }; @@ -130,7 +130,7 @@ function traceEvent(cat, action, label, value) { - if (Boolean(localStorage.getItem(LoggingPhase))){ + // if (Boolean(localStorage.getItem(LoggingPhase))){ if (starting) { //if (StartedLogging()) { // storageType.setItem(LoggingPhase,false); @@ -138,10 +138,10 @@ starting = false; _sending = []; traceEvent("log_1", "Vistorian Trace", "Session", "Start"); - traceEvent("_trace", "document.location", "href", localStorage.getItem(SessionLogId)); - traceEvent("_trace", "browser", "userAgent", navigator.userAgent); - traceEvent("_trace", "screen", "size", "w:"+screen.width+";h:"+screen.height); - traceEvent("_trace", "window", "innerSize", "w:"+window.innerWidth+";h:"+window.innerHeight); + // traceEvent("_trace", "document.location", "href", localStorage.getItem(SessionLogId)); + // traceEvent("_trace", "browser", "userAgent", navigator.userAgent); + // traceEvent("_trace", "screen", "size", "w:"+screen.width+";h:"+screen.height); + // traceEvent("_trace", "window", "innerSize", "w:"+window.innerWidth+";h:"+window.innerHeight); _sending = null; } @@ -158,7 +158,7 @@ if (_sending == null) sendLogs(); return trace; - } + // } } // console.log("Trace initialized with sessionId=%s", sessionId); From e2c7dddf48c057f9b0365c21eded9e91bea858c4 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Wed, 28 Jul 2021 09:41:57 +0200 Subject: [PATCH 10/26] introduce slight link curve nand show node location on label --- src/map.ts | 41 ++++++++++++++++++++++++++++------------- 1 file changed, 28 insertions(+), 13 deletions(-) diff --git a/src/map.ts b/src/map.ts index 58f8969..20d5bdc 100644 --- a/src/map.ts +++ b/src/map.ts @@ -545,18 +545,18 @@ function init() { function createNodeLabel(npo: any) { - var locationLabel: any = ''; - if (npo.location == undefined || npo.location.label() == undefined) { - locationLabel = ''; - } - else { - locationLabel = npo.location.label() + ', '; + var locationLabel: String = ''; + if (npo.location != undefined && npo.location.label() != undefined) + { + locationLabel = ', ' + npo.location.label(); } + var time: any = dgraph.time(npo.timeIds[0]); + var timeLabel:String = '' if (time) - return npo.node.label() + ' (' + moment.utc(time.unixTime()).format('MM/DD/YYYY') + ')'; - else - return npo.node.label(); + timeLabel = ' (' + moment.utc(time.unixTime()).format('MM/DD/YYYY') + ')'; + + return npo.node.label() + locationLabel + timeLabel; } var hittestRect: google.maps.LatLngBounds = new google.maps.LatLngBounds(); @@ -926,8 +926,8 @@ function updateLocationMarkers() { // Calculates curve paths for links function updateLinkPaths() { - var path: any, dir: any, offset: any, center: any; - var link: dynamicgraph.Link | undefined; + var path: any, dir: any, offset: any, center: any; + var link: dynamicgraph.Link | any; var sourceNPO: any, targetNPO: any; var EDGE_GAP: any = 5 var cx1: any, cy1: any, cx2: any, cy2: any; @@ -976,10 +976,12 @@ function updateLinkPaths() { } else { cx1 = center.x; cy1 = center.y; - cx2 = cx1; - cy2 = cy1; + // cx2 = cx1; + // cy2 = cy1; + var l : number = Math.sqrt(dir.x * dir.x + dir.y * dir.y); (link as any)['path'] = [ { x: sourceNPO.x, y: sourceNPO.y }, + { x: center.x, y: center.y - l * .15}, { x: targetNPO.x, y: targetNPO.y }] } } @@ -989,6 +991,19 @@ function updateLinkPaths() { } +// somehow is not called! +// function randomSeed(link: dynamicgraph.Link) +// { +// console.log('randomseed'); +// var nodes = this.dynamicgraph.nodes().toArray(); +// var numNodes = nodes.length; +// var si = nodes.indexOf(link.source) +// var ti = nodes.indexOf(link.target) +// var v = (si * ti + si + ti) / (numNodes*numNodes + numNodes+numNodes) +// console.log('v', v) +// return v * .2; +// } + function showLabel(i: any, b: any) { if (b) { d3.select('#nodeLabelBackground_' + i) From 05953f70baf80e61b5744de44c48e11be8261a90 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Wed, 28 Jul 2021 09:57:28 +0200 Subject: [PATCH 11/26] place nodes without locations to null.null --- src/map.ts | 69 ++++++++++++++++++++++++++++++------------------------ 1 file changed, 38 insertions(+), 31 deletions(-) diff --git a/src/map.ts b/src/map.ts index 20d5bdc..ff88917 100644 --- a/src/map.ts +++ b/src/map.ts @@ -1122,42 +1122,49 @@ function reorderLabels() { function updateNodePositions() { var npo: any; - for (var i = 0; i < nodePositionObjects.length; i++) { + for (var i = 0; i < nodePositionObjects.length; i++) + { npo = nodePositionObjects[i]; npo.x = npo.xOrig + npo.displacementVector[0] * OVERLAP_FRACTION; npo.y = npo.yOrig + npo.displacementVector[1] * OVERLAP_FRACTION; } - - for (var i = 0; i < nodePositionObjects.length; i++) { - if (!nodePositionObjects[i].fixedPosition) { - npo = nodePositionObjects[i] - - // calculat barycenter of related npos - var x_bar: number = 0 - var y_bar: number = 0 - for (var j = 0; j < npo.inNeighbors.length; j++) { - x_bar += npo.inNeighbors[j].x - y_bar += npo.inNeighbors[j].y - } - for (var j = 0; j < npo.outNeighbors.length; j++) { - x_bar += npo.outNeighbors[j].x - y_bar += npo.outNeighbors[j].y - } - x_bar /= (npo.inNeighbors.length + npo.outNeighbors.length) - y_bar /= (npo.inNeighbors.length + npo.outNeighbors.length) - - var x_vec: number = npo.x - x_bar; - var y_vec: number = npo.y - y_bar; - var d: number = Math.sqrt(x_vec * x_vec + y_vec * y_vec); - if (d == 0) { - d = 1; - } - x_vec /= d; - y_vec /= d; - - npo.x = x_bar + 200 * x_vec; - npo.y = y_bar + 200 * y_vec; + for (var i = 0; i < nodePositionObjects.length; i++) + { + if (!nodePositionObjects[i].fixedPosition) + { + // npo = nodePositionObjects[i] + + // // calculate barycenter of related npos + // var x_bar: number = 0 + // var y_bar: number = 0 + // for (var j = 0; j < npo.inNeighbors.length; j++) + // { + // x_bar += npo.inNeighbors[j].x + // y_bar += npo.inNeighbors[j].y + // } + // for (var j = 0; j < npo.outNeighbors.length; j++) + // { + // x_bar += npo.outNeighbors[j].x + // y_bar += npo.outNeighbors[j].y + // } + // x_bar /= (npo.inNeighbors.length + npo.outNeighbors.length) + // y_bar /= (npo.inNeighbors.length + npo.outNeighbors.length) + + // var x_vec: number = npo.x - x_bar; + // var y_vec: number = npo.y - y_bar; + // var d: number = Math.sqrt(x_vec * x_vec + y_vec * y_vec); + // if (d == 0) + // { + // d = 1; + // } + // x_vec /= d; + // y_vec /= d; + + // npo.x = x_bar + 200 * x_vec; + // npo.y = y_bar + 200 * y_vec; + npo.x = 0; + npo.y = 0; } } From 2976f771c338f65c0b21cf7ce53ddba07c6f832e Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sun, 1 Aug 2021 11:57:04 +0200 Subject: [PATCH 12/26] ignore trace then on localhost --- src/map.ts | 18 ++++++++++-------- static/traces/trace.js | 5 ++++- 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/map.ts b/src/map.ts index ff88917..af1537a 100644 --- a/src/map.ts +++ b/src/map.ts @@ -352,21 +352,22 @@ function init() { // obtain nodePositionObjects // one npo per node x position var npo: NodePositionObject = new NodePositionObject(); - var nodes: any[] = dgraph.nodes().toArray(); - var n: any, positions: any; + var nodes: dynamicgraph.Node[] = dgraph.nodes().toArray(); + var n: dynamicgraph.Node, positions: any; var googleLatLng: any; var serie: any; - for (var i = 0; i < nodes.length; i++) { + for (var i = 0; i < nodes.length; i++) + { n = nodes[i]; - positions = n.locationSerie().serie; + positions = n.locationSerie().getSerie(); serie = new dynamicgraph.ScalarTimeSeries(); nodePositionObjectsLookupTable.push(serie); for (var tId in positions) { googleLatLng = new google.maps.LatLng( - positions[tId].latitude(), - positions[tId].longitude()); + positions[parseInt(tId)].latitude(), + positions[parseInt(tId)].longitude()); // check if npo for this node and position does - // already exist, if not its created in side this function + // already exist, if norun t its created in side this function npo = getNodePositionObjectsForLocation(n, positions[tId].longitude(), positions[tId].latitude()); npo.location = positions[tId] if (positions[tId].npos.indexOf(npo) == -1) { @@ -931,7 +932,8 @@ function updateLinkPaths() { var sourceNPO: any, targetNPO: any; var EDGE_GAP: any = 5 var cx1: any, cy1: any, cx2: any, cy2: any; - for (var i = 0; i < dgraph.links().length; i++) { + for (var i = 0; i < dgraph.links().length; i++) + { link = dgraph.link(i); if (link) diff --git a/static/traces/trace.js b/static/traces/trace.js index 9fab61c..826d7ae 100644 --- a/static/traces/trace.js +++ b/static/traces/trace.js @@ -94,7 +94,10 @@ httpRequest.setRequestHeader("Accept", "text/plain"); // httpRequest.setRequestHeader("Content-Length", json.length); } - httpRequest.send(json); + if(!window.location.origin.includes('localhost')) + { + httpRequest.send(json); + } }; var sendLogs = function() { From fa3a204053c01981e88536a4861c3fa8b2a6fb94 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sun, 1 Aug 2021 21:22:25 +0200 Subject: [PATCH 13/26] add link edge gap function to map --- src/map.ts | 153 +++++++++++++++++++++++++++++++++++++++++++++++------ 1 file changed, 136 insertions(+), 17 deletions(-) diff --git a/src/map.ts b/src/map.ts index af1537a..ea4443f 100644 --- a/src/map.ts +++ b/src/map.ts @@ -14,7 +14,7 @@ import * as moment from 'moment'; var COLOR_DEFAULT_LINK: string = '#999999'; var COLOR_DEFAULT_NODE: string = '#999999'; var COLOR_HIGHLIGHT: string = '#ff8800'; -var INNER_OPACITY: number = 0.8; +var LINK_OPACITY: number = 0.4; var NODE_UNPOSITIONED_OPACITY: number = 0.4 var LOCATION_MARKER_WIDTH: number = 10; var OVERLAP_FRACTION: number = 0.3; @@ -22,6 +22,7 @@ var NODE_SIZE: number = 4; var OUT_OF_TIME_NODES_OPACITY: number = 0; var LABEL_OFFSET_X: number = 20; var SHOW_NON_PLACE: boolean = true; +var LINK_GAP = 2; var width: number = window.innerWidth var height: number = window.innerHeight - 100; @@ -58,6 +59,44 @@ var emptyNodePositions: any = {} var nodePositionObjects: any[] = []; var nodePositionObjectsLookupTable: any[] = []; +var geoMultiLinks:GeoMultiLink[] = []; + +// class GeoLink extends dynamicgraph.Link{ + +// GeoLink(){ +// super(); +// } +// sourceNPO: NodePositionObject; +// targetNPO: NodePositionObject; +// } + +class GeoMultiLink{ + + // private sourceNPOs: NodePositionObject[] = []; + // private targetNPOs: NodePositionObject[] = []; + private links:dynamicgraph.Link[] = [] + + public numLinks() + { + return this.links.length; + } + public addLink(link:any) + { + if(this.links.indexOf(link) == -1) + { + this.links.push(link) + link.geoMultiLink = this; + } + } + public getLinks():dynamicgraph.Link[]{ + return this.links; + } + public linkIndex(l:any):number + { + return this.links.indexOf(l); + } +} + export class NodePositionObject { timeIds: number[] = []; location: any; // BEFORE queries.Location; @@ -738,7 +777,7 @@ function updateLinks(highlightId?: number) { if (intersectedLink == d) return 1; else - return INNER_OPACITY * .3; + return LINK_OPACITY * .3; } return d.isHighlighted() @@ -746,7 +785,7 @@ function updateLinks(highlightId?: number) { || d.target.isHighlighted() ? // 1 : // INNER_OPACITY; - Math.min(1, INNER_OPACITY + .2) : INNER_OPACITY; + Math.min(1, LINK_OPACITY) : LINK_OPACITY; }) .style('stroke-width', function (d: any) { @@ -927,15 +966,28 @@ function updateLocationMarkers() { // Calculates curve paths for links function updateLinkPaths() { - var path: any, dir: any, offset: any, center: any; - var link: dynamicgraph.Link | any; + var path: any, dir: any, offset: any; + var center: any; + var link, link2: dynamicgraph.Link | any; var sourceNPO: any, targetNPO: any; var EDGE_GAP: any = 5 var cx1: any, cy1: any, cx2: any, cy2: any; + + // reinit geoMultiLinks + geoMultiLinks = []; + var geoMultiLink:GeoMultiLink; for (var i = 0; i < dgraph.links().length; i++) { link = dgraph.link(i); + (link).geoMultiLink = undefined; + } + for (var i = 0; i < dgraph.links().length; i++) + { + + link = dgraph.link(i); + + // check for NPOs if (link) sourceNPO = link.sourceNPO; else @@ -952,6 +1004,37 @@ function updateLinkPaths() { if (targetNPO == undefined) targetNPO = { x: 0, y: 0 }; + (link).sourceNPO = sourceNPO; + (link).targetNPO = targetNPO; + + // check for geomultilinks + for (var j = 0; j < i; j++) + { + link2 = dgraph.link(j); + if(linkOverlapTest(link, link2)) + { + // console.log('link overlap', i,j) + if((link2).geoMultiLink) + { + geoMultiLink = (link2).geoMultiLink; + geoMultiLink.addLink(link); + }else{ + geoMultiLink = new GeoMultiLink(); + geoMultiLinks.push(geoMultiLink); + geoMultiLink.addLink(link); + geoMultiLink.addLink(link2); + } + } + } + } + console.log('>> TOTAL MULTILINKS:', geoMultiLinks.length); + + for (var i = 0; i < dgraph.links().length; i++) + { + link = dgraph.link(i); + sourceNPO = link?.sourceNPO; + targetNPO = link?.targetNPO; + dir = { x: targetNPO.x - sourceNPO.x, y: targetNPO.y - sourceNPO.y @@ -964,8 +1047,10 @@ function updateLinkPaths() { y: sourceNPO.y + dir.y / 2 } + // self-links if (sourceNPO.x == targetNPO.x - && sourceNPO.y == targetNPO.y) { + && sourceNPO.y == targetNPO.y) + { cx1 = center.x + 30 + Math.random() * 30; cy1 = center.y - 10 + Math.random() * 30; cx2 = center.x + 10 + Math.random() * 30; @@ -975,15 +1060,23 @@ function updateLinkPaths() { { x: cx1, y: cy1 }, { x: cx2, y: cy2 }, { x: targetNPO.x, y: targetNPO.y }] - } else { + } else + { + // non-self links cx1 = center.x; cy1 = center.y; - // cx2 = cx1; - // cy2 = cy1; - var l : number = Math.sqrt(dir.x * dir.x + dir.y * dir.y); + + // let linkLength : number = Math.sqrt(dir.x * dir.x + dir.y * dir.y); + let multiplier: number = 0; + if((link).geoMultiLink) + { + let multiLink:GeoMultiLink = ((link).geoMultiLink); + multiplier = multiLink.linkIndex(link) - multiLink.numLinks() / 2; + } + let stretch = multiplier * LINK_GAP; (link as any)['path'] = [ { x: sourceNPO.x, y: sourceNPO.y }, - { x: center.x, y: center.y - l * .15}, + { x: center.x + (offset[0] * stretch), y: center.y + (offset[1] * stretch)}, { x: targetNPO.x, y: targetNPO.y }] } } @@ -993,6 +1086,29 @@ function updateLinkPaths() { } + +function linkOverlapTest(l1: any, l2: any): boolean +{ + return l1.sourceNPO == l2.sourceNPO && l1.targetNPO == l2.targetNPO; + // var distX = l1.sourceNPO.x - l2.sourceNPO.x + // var distY = l1.sourceNPO.y - l2.sourceNPO.y + // var dist = Math.sqrt(distX * distX + distY * distY); + // if(dist > NODE_SIZE*2) + // { + // // source NPOs are not overlapping, hence return at this point. + // return false; + // }else{ + // distX = l1.targetNPO.x - l2.targetNPO.x + // distY = l1.targetNPO.y - l2.targetNPO.y + // dist = Math.sqrt(distX * distX + distY * distY); + // if(dist > NODE_SIZE*2) + // { + // return false; + // } + // } + // return true; +} + // somehow is not called! // function randomSeed(link: dynamicgraph.Link) // { @@ -1052,17 +1168,20 @@ ui.makeSlider(menuDiv, 'Node Overlap', 100, MENU_HEIGHT, OVERLAP_FRACTION, -.05, OVERLAP_FRACTION = value; updateNodePositions(); }) - +ui.makeSlider(menuDiv, 'Edge Gap', 100, MENU_HEIGHT, LINK_GAP, 0, 10, function (value: number) { + LINK_GAP = value; + updateLinkPaths(); +}) // LINK OPACITY SLIDER var menuDiv = d3.select('#menuDiv'); -ui.makeSlider(menuDiv, 'Link Opacity', 100, MENU_HEIGHT, INNER_OPACITY, 0, 1, function (value: number) { - INNER_OPACITY = value; +ui.makeSlider(menuDiv, 'Link Opacity', 100, MENU_HEIGHT, LINK_OPACITY, 0, 1, function (value: number) { + LINK_OPACITY = value; updateLinks(); }) // NON-POSITIONED NODES OPACITY SLIDER var menuDiv = d3.select('#menuDiv'); -ui.makeSlider(menuDiv, 'Opacity of Positionless Nodes', 200, MENU_HEIGHT, INNER_OPACITY, 0, 1, function (value: number) { +ui.makeSlider(menuDiv, 'Opacity of Positionless Nodes', 100, MENU_HEIGHT, LINK_OPACITY, 0, 1, function (value: number) { NODE_UNPOSITIONED_OPACITY = value; updateNodes(); }) @@ -1320,7 +1439,7 @@ function setStateHandler(m: messenger.SetStateMessage){ OVERLAP_FRACTION = state.nodeOverlap; updateNodePositions(); - INNER_OPACITY = state.linkOpacity; + LINK_OPACITY = state.linkOpacity; updateLinks(); NODE_UNPOSITIONED_OPACITY = state.opacityOfPositionlessNodes; @@ -1338,7 +1457,7 @@ function setStateHandler(m: messenger.SetStateMessage){ function getStateHandler( m: messenger.GetStateMessage){ if (m.viewType=="map"){ - var mapNetwork: messenger.NetworkControls=new messenger.MapControls("map",time_start.unixTime(),time_end.unixTime(),OVERLAP_FRACTION,INNER_OPACITY,NODE_UNPOSITIONED_OPACITY); + var mapNetwork: messenger.NetworkControls=new messenger.MapControls("map",time_start.unixTime(),time_end.unixTime(),OVERLAP_FRACTION,LINK_OPACITY,NODE_UNPOSITIONED_OPACITY); /* var bookmarksArray=JSON.parse(localStorage.getItem("vistorianBookmarks") || "[]"); if (m.bookmarkIndex!=bookmarksArray.length-1){ From b613a1f8a59b8ad5cb3c6052b2df25c9e1b78f9b Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 2 Aug 2021 12:40:07 +0200 Subject: [PATCH 14/26] load vistorian-module from npm --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 37af3f2..206559b 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,6 @@ "three": "^0.100.0", "jstorage": "^0.4.8", "lz-string": "^1.4.4", - "vistorian-core": "file:../vistorian-core" + "vistorian-core": "latest" } } From 74944d54a10395e5ed1e9f6bd0507bea4649a5d9 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 2 Aug 2021 12:40:41 +0200 Subject: [PATCH 15/26] load vistorian-core from npm and show multiple links --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 206559b..688350a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vistorian-map", - "version": "0.0.2-alpha", + "version": "0.0.2", "description": "Vistorian-map is a java script / (Typescript) library and a programming framework for interactive network visualizations with:", "main": "lib/index.js", "types": "lib/index.d.js", From 60c6c0de3aa6d14c9819603a62e1899ad6352980 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 2 Aug 2021 12:41:57 +0200 Subject: [PATCH 16/26] fix traces output issue --- static/traces/trace.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/static/traces/trace.js b/static/traces/trace.js index 826d7ae..05790a2 100644 --- a/static/traces/trace.js +++ b/static/traces/trace.js @@ -85,7 +85,10 @@ } }; var json = JSON.stringify(list); - httpRequest.open("POST", traceUrl, true); + if(!window.location.origin.includes('localhost')) + { + httpRequest.open("POST", traceUrl, true); + } if (window.XDomainRequest) { // no request header? } From ed3f8abf08e14df71ce58f92259d705a89020e0f Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 2 Aug 2021 12:43:28 +0200 Subject: [PATCH 17/26] fix traces output issue on localhost2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 688350a..28dfde0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "vistorian-map", - "version": "0.0.2", + "version": "0.0.3", "description": "Vistorian-map is a java script / (Typescript) library and a programming framework for interactive network visualizations with:", "main": "lib/index.js", "types": "lib/index.d.js", From 44d121d77444311e2b4ef41ca9734547f3f6ac8f Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Mon, 2 Aug 2021 16:13:20 +0200 Subject: [PATCH 18/26] load vistorian-core locally --- index.html | 16 ++------------- package.json | 2 +- static/{traces => }/trace.js | 0 static/traces/trace_test_130529.js | 32 ------------------------------ web/index.html | 6 +----- 5 files changed, 4 insertions(+), 52 deletions(-) rename static/{traces => }/trace.js (100%) delete mode 100644 static/traces/trace_test_130529.js diff --git a/index.html b/index.html index d9620b5..51bd5a7 100644 --- a/index.html +++ b/index.html @@ -10,8 +10,6 @@ - - @@ -25,24 +23,15 @@ - + Node link - - - - @@ -52,10 +41,9 @@ diff --git a/package.json b/package.json index 28dfde0..9fb57ff 100644 --- a/package.json +++ b/package.json @@ -49,6 +49,6 @@ "three": "^0.100.0", "jstorage": "^0.4.8", "lz-string": "^1.4.4", - "vistorian-core": "latest" + "vistorian-core": "file:../vistorian-core" } } diff --git a/static/traces/trace.js b/static/trace.js similarity index 100% rename from static/traces/trace.js rename to static/trace.js diff --git a/static/traces/trace_test_130529.js b/static/traces/trace_test_130529.js deleted file mode 100644 index cef4cbd..0000000 --- a/static/traces/trace_test_130529.js +++ /dev/null @@ -1,32 +0,0 @@ -// COOKIE STUFF -function createCookie(name,value,days) { - if (days) { - var date = new Date(); - date.setTime(date.getTime()+(days*24*60*60*1000)); - var expires = "; expires="+date.toGMTString(); - } - else var expires = ""; - document.cookie = name+"="+value+expires+"; path=/"; -} - -function readCookie(name) { - var nameEQ = name + "="; - var ca = document.cookie.split(';'); - for(var i=0;i < ca.length;i++) { - var c = ca[i]; - while (c.charAt(0)==' ') c = c.substring(1,c.length); - if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length); - } - return null; -} - -function eraseCookie(name) { - createCookie(name,"",-1); -} - -trace.debug(true); - - -function trace_help() { - trace.event("help", "ts_matrixVisManual", "CCC", "DDD") -} \ No newline at end of file diff --git a/web/index.html b/web/index.html index b124fca..1ede263 100644 --- a/web/index.html +++ b/web/index.html @@ -12,9 +12,7 @@ - - - + @@ -28,8 +26,6 @@ Map - -