jekyll-zeta 0.11.7 → 0.11.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/_includes/getmapdata.js +6 -6
- data/_includes/js_source/getmapdata.js +4 -2
- metadata +1 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA256:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: f9a30b4038cfe08a17753b29af232e737cb2744c4a4408786fcc9467e5905f42
|
4
|
+
data.tar.gz: 6998219e0b6292417296656a923634ba39f08ccfdc972e33c4e71c7ad14cd916
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: c9dd78098cb4540bfce96935345d31ff8ac0c4e52f12175f5e4dc4564872d900cdb197fcdc8bd77c8db6b353e537d3527d66478080442e8ee18e9f534338988b
|
7
|
+
data.tar.gz: c95e2b879e844ff770f653a01d509f7efc656c4493e6489c79d27ac780d3fd64925356ae1af2765f980eee90316cb4d46e158d197172ae9fca15e6ba91d2f208
|
data/_includes/getmapdata.js
CHANGED
@@ -1,16 +1,16 @@
|
|
1
1
|
|
2
2
|
|
3
|
-
/*********** getmapdata.js [
|
3
|
+
/*********** getmapdata.js [764740ab30] ***********/
|
4
4
|
|
5
5
|
!function(){var t=100;function e(t){const e=t.split("-").map(Number);if(3!==e.length)throw new Error(`Invalid date format: ${t}`);const[n,r,l]=e;return new Date(n,r-1,l)}function n(t,e){if(t){const n=t.split("-")
|
6
6
|
;if(3==n.length)return`${n[0]}-${n[1].padStart(2,"0")}-${n[2].padStart(2,"0")}`;if(2==n.length)return`${e}-${n[0].padStart(2,"0")}-${n[1].padStart(2,"0")}`}return t}function r(t){let e=t.getMonth()+1,n=t.getDate()
|
7
7
|
;return`${t.getFullYear()}-${e<10?"0"+e:e}-${n<10?"0"+n:n}`}function l(t,i,a){if(!t)return null;let o=t.trim();if(!o)return null;if(i&&function(t,e){if(t&&t.startsWith("#")){let n=t.split(" ");if(n.length>=2){let r=n[0].substring(1)
|
8
|
-
;if(r)return e[r]=t.substring(r.length+2).trim(),1}}return 0}(o,i))return null;var u=o.split(" "),s=u[0];if(s=s.replace("~","~"),i&&s.indexOf("~")>0){let t=s.split("~"),
|
9
|
-
;t&&!isNaN(t)&&(
|
10
|
-
const e=
|
8
|
+
;if(r)return e[r]=t.substring(r.length+2).trim(),1}}return 0}(o,i))return null;var u=o.split(" "),s=u[0];if(s=s.replace("~","~"),i&&s.indexOf("~")>0){let t=s.split("~"),o=t[0],f=t[1],c=e(n(o,a));if(!c||isNaN(c))return;let d=7;if(f){let t=e(n(f,a))
|
9
|
+
;t&&!isNaN(t)&&(d=Math.floor((t.getTime()-c.getTime())/864e5)+1)}else d=Math.floor((Date.now()-c.getTime())/864e5)+1,d>7&&(d=7);const g=u.slice(1).join(" ");let p=[];const m=c.getTime();for(let t=0;t<d;t++){
|
10
|
+
const e=r(new Date(m+864e5*t))+" "+g,n=l(e,i,a);n&&p.push(n)}return p.length?p:null}let f="";if(!s)return null;{let t=s.split("-"),e=0,n=0,r=0;if(a&&2==t.length)e=a,n=t[0],r=t[1];else{if(3!=t.length)return;e=t[0],n=t[1],r=t[2]}
|
11
11
|
let l=Number(e),i=Number(n),o=Number(n);if(isNaN(l)||isNaN(o)||isNaN(i)||l<1900||l>2100||i<1||i>12||o<1||o>31)return null;f=e+"-"+n.padStart(2,"0")+"-"+r.padStart(2,"0")}if(!f)return null;var c="";let d;if(u.length>1){c=u.slice(1).join(" ")
|
12
|
-
;const t=/#[0-9a-fA-F]{6}/;let e=t.exec(c);e&&e.length?(d=e[0],c=c.replace(t,"")):d=i&&i.color||"#40c463"}return{date:f,title:c,color:d}}function i(t,e){if(!e)return
|
13
|
-
;t.allYear[n]=l?l+1:1;let i=t[n];i||(i={},t[n]=i);let a=i[r];a||(a=[],i[r]=a),a.push(e)}function a(e,n){let r={},a={allYear:r
|
12
|
+
;const t=/#[0-9a-fA-F]{6}/;let e=t.exec(c);e&&e.length?(d=e[0],c=c.replace(t,"")):d=i&&i.color||"#40c463"}return d=d||i&&i.color||"#40c463",{date:f,title:c,color:d}}function i(t,e){if(!e)return
|
13
|
+
;let n=e.date.substring(0,4),r=e.date.substring(5,7),l=t.allYear[n];t.allYear[n]=l?l+1:1;let i=t[n];i||(i={},t[n]=i);let a=i[r];a||(a=[],i[r]=a),a.push(e)}function a(e,n){let r={},a={allYear:r
|
14
14
|
},o=0,u=new Date,s=`${u.getFullYear()-1}-${(u.getMonth()+1).toString().padStart(2,"0")}-${u.getDate().toString().padStart(2,"0")}`,f=null;if(e.split("\n").forEach((function(t,e){if(0==e)return;let n=l(t,a,f);n&&Array.isArray(n)?n.forEach((t=>{i(a,t),
|
15
15
|
t&&(f=t.date.substring(0,4),t.date>=s&&o++)})):(i(a,n),n&&(f=n.date.substring(0,4),n.date>=s&&o++))})),a.title){let t=document.createElement("div");t.className="custom-map-title",t.innerText=a.title||"",n.parentNode.insertBefore(t,n)}
|
16
16
|
let c=Object.keys(r).sort().reverse(),d=a.recent,g=!0;g=d?"1"==d:o&&c.length>1,g&&create_heatmap_lv("lmpRecent365"+t++,"",a,"Last 1Y",o,n);for(let e=0;e<c.length;e++){let r=c[e];create_heatmap_lv("lmp"+r+t++,r,a,void 0,void 0,n)}
|
@@ -89,7 +89,8 @@
|
|
89
89
|
for (let i = 0; i < rangCount; i ++) {
|
90
90
|
const ymd = date2ymd(new Date(timeStampBegin + i * 86400000))
|
91
91
|
const newStr = ymd + ' ' + desc
|
92
|
-
const newEle = getDataFromSignleLine(newStr,
|
92
|
+
const newEle = getDataFromSignleLine(newStr,gData,YearDefault)
|
93
|
+
console.log('newDesc',newStr,newEle)
|
93
94
|
if(newEle){
|
94
95
|
resultArr.push(newEle)
|
95
96
|
}
|
@@ -149,8 +150,9 @@
|
|
149
150
|
else{
|
150
151
|
color = (gData && gData.color )|| '#40c463'
|
151
152
|
}
|
152
|
-
|
153
153
|
}
|
154
|
+
|
155
|
+
color = color || (gData && gData.color )|| '#40c463'
|
154
156
|
return { date: date, title: title ,color}
|
155
157
|
}
|
156
158
|
|