- added rising decans
- changed info modal - added ascendant and mc to ephemeris calculation
This commit is contained in:
flux
parent
2c561f4391
commit
eb70f55938
4 changed files with 368 additions and 10 deletions
|
|
@ -28,7 +28,7 @@ SL.Calendar = (function() {
|
|||
function about() {
|
||||
$('<div/>').loadTemplate($("#tpl-modal"), {
|
||||
title : '<center><h1 class="stoke">SUBLUNAR ALMANAC</h1></center>',
|
||||
right : '<center><p><style>.bmc-button img{width: 27px !important;margin-bottom: 1px !important;box-shadow: none !important;border: none !important;vertical-align: middle !important;}.bmc-button{line-height: 36px !important;height:37px !important;text-decoration: none !important;display:inline-flex !important;color:#000000 !important;background-color:#FFFFFF !important;border-radius: 3px !important;border: 1px solid transparent !important;padding: 1px 9px !important;font-size: 22px !important;letter-spacing: 0.6px !important;box-shadow: 0px 1px 2px rgba(190, 190, 190, 0.5) !important;-webkit-box-shadow: 0px 1px 2px 2px rgba(190, 190, 190, 0.5) !important;margin: 0 auto !important;font-family:\'Cookie\', cursive !important;-webkit-box-sizing: border-box !important;box-sizing: border-box !important;-o-transition: 0.3s all linear !important;-webkit-transition: 0.3s all linear !important;-moz-transition: 0.3s all linear !important;-ms-transition: 0.3s all linear !important;transition: 0.3s all linear !important;}.bmc-button:hover, .bmc-button:active, .bmc-button:focus {-webkit-box-shadow: 0px 1px 2px 2px rgba(190, 190, 190, 0.5) !important;text-decoration: none !important;box-shadow: 0px 1px 2px 2px rgba(190, 190, 190, 0.5) !important;opacity: 0.85 !important;color:#000000 !important;}</style><link href="https://fonts.googleapis.com/css?family=Cookie" rel="stylesheet"><a class="bmc-button" target="_blank" href="https://www.buymeacoffee.com/sublunar"><img src="https://www.buymeacoffee.com/assets/img/BMC-btn-logo.svg" alt="Buy me a coffee"><span style="margin-left:5px">Buy me a coffee</span></a> <a class="github-button" href="https://github.com/sublunarspace/sublunar.almanac" data-size="large" aria-label="Star sublunarspace/sublunar.almanac on GitHub">GitHub</a></p><p><a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a> © 2018 T. F. Raaion / <a href="http://sublunar.space">sublunar space</a></p></center><hr /><center><p>Astronomical calculations are based on <br /><a href="http://www.astro.com/swisseph/swephinfo_e.htm" target="_blank">Swiss Ephemeris API</a>, © 1997-2016 Astrodienst AG, <a href="https://opensource.org/licenses/GPL-2.0" target="_blank">(GPLv2.0+)</a><br />and the <a href="http://www.moshier.net/#Astronomy" target="_blank">Table of New Moon Dates</a> by Steve Moshier.</p><p>The front-end relies on the following Javascript Libraries:<br /><a href="https://jquery.com/" target="_blank">jQuery 3.2.1</a>, © JS Foundation, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="https://getbootstrap.com/" target="_blank">Bootstrap 3.3.7</a>, © Twitter, Inc., <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="https://github.com/codepb/jquery-template/" target="_blank">jQuery.loadTemplate</a>, © 2013 Paul Burgess and other contributors, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="http://momentjs.com" target="_blank">MomentJS 2.18.1</a>, © Tim Wood, Iskren Chernev, Moment.js contributors, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="http://isotope.metafizzy.co" target="_blank">Isotope 3.0.4</a>, © 2017 Metafizzy, <a href="https://opensource.org/licenses/GPL-3.0" target="_blank">(GPLv3)</a><br /><a href="http://defiantjs.com" target="_blank">DefiantJS 1.4.1</a>, © 2013-2017, Hakan Bilgin, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="http://ricostacruz.com/nprogress" target="_blank">NProgress</a>, © 2013, 2014 Rico Sta. Cruz, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="https://github.com/klokantech/javascript" target="_blank">OsmNamesAutocomplete</a>, © 2016 Klokan Technologies GmbH, <a href="https://opensource.org/licenses/GPL-3.0" target="_blank">(GPLv3)</a><br /><a href="https://github.com/darkskyapp/tz-lookup" target="_blank">tzlookup</a>, by The Dark Sky, LLC, <a href="https://creativecommons.org/publicdomain/zero/1.0/" target="_blank">(CC0 1.0 Universal)</a><br /><a href="https://github.com/nwcell/ics.js/" target="_blank">ics.js</a>, © 2018 Travis Krause, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a></p><p>The design is based on<br /><a href="http://bootswatch.com" target="_blank">bootswatch v3.3.7</a>, © 2012-2017 Thomas Park, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a>.</center><script async defer src="https://buttons.github.io/buttons.js"></script>'
|
||||
right : '<center><p><a href="https://ko-fi.com/U7U4NQ0Q" target="_blank"><img height="30" src="https://az743702.vo.msecnd.net/cdn/kofi3.png?v=0" border="0" alt="Buy Me a Coffee at ko-fi.com" /></a><br /><br /><a class="github-button" href="https://github.com/sublunarspace/sublunar.almanac" data-size="large" aria-label="Star sublunarspace/sublunar.almanac on GitHub">GitHub</a></p><p><a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a> © 2018 T. F. Raaion / <a href="http://sublunar.space">sublunar space</a><br />contact: <a href=\'mailto:info@sublunar.space\'>info@sublunar.space</a></p></center><hr /><center><p>Astronomical calculations are based on <br /><a href="http://www.astro.com/swisseph/swephinfo_e.htm" target="_blank">Swiss Ephemeris API</a>, © 1997-2016 Astrodienst AG, <a href="https://opensource.org/licenses/GPL-2.0" target="_blank">(GPLv2.0+)</a><br />and the <a href="http://www.moshier.net/#Astronomy" target="_blank">Table of New Moon Dates</a> by Steve Moshier.</p><p>The front-end relies on the following Javascript Libraries:<br /><a href="https://jquery.com/" target="_blank">jQuery 3.2.1</a>, © JS Foundation, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="https://getbootstrap.com/" target="_blank">Bootstrap 3.3.7</a>, © Twitter, Inc., <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="https://github.com/codepb/jquery-template/" target="_blank">jQuery.loadTemplate</a>, © 2013 Paul Burgess and other contributors, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="http://momentjs.com" target="_blank">MomentJS 2.18.1</a>, © Tim Wood, Iskren Chernev, Moment.js contributors, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="http://isotope.metafizzy.co" target="_blank">Isotope 3.0.4</a>, © 2017 Metafizzy, <a href="https://opensource.org/licenses/GPL-3.0" target="_blank">(GPLv3)</a><br /><a href="http://defiantjs.com" target="_blank">DefiantJS 1.4.1</a>, © 2013-2017, Hakan Bilgin, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="http://ricostacruz.com/nprogress" target="_blank">NProgress</a>, © 2013, 2014 Rico Sta. Cruz, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a><br /><a href="https://github.com/klokantech/javascript" target="_blank">OsmNamesAutocomplete</a>, © 2016 Klokan Technologies GmbH, <a href="https://opensource.org/licenses/GPL-3.0" target="_blank">(GPLv3)</a><br /><a href="https://github.com/darkskyapp/tz-lookup" target="_blank">tzlookup</a>, by The Dark Sky, LLC, <a href="https://creativecommons.org/publicdomain/zero/1.0/" target="_blank">(CC0 1.0 Universal)</a><br /><a href="https://github.com/nwcell/ics.js/" target="_blank">ics.js</a>, © 2018 Travis Krause, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a></p><p>The design is based on<br /><a href="http://bootswatch.com" target="_blank">bootswatch v3.3.7</a>, © 2012-2017 Thomas Park, <a href="https://opensource.org/licenses/MIT" target="_blank">(MIT)</a>.</center><script async defer src="https://buttons.github.io/buttons.js"></script>'
|
||||
})
|
||||
.appendTo('#modals')
|
||||
.attr('id', 'aboutSLC')
|
||||
|
|
@ -104,6 +104,12 @@ SL.Calendar = (function() {
|
|||
});
|
||||
}
|
||||
|
||||
function unik(array){
|
||||
return array.filter(function(el, index, arr) {
|
||||
return index === arr.indexOf(el);
|
||||
});
|
||||
}
|
||||
|
||||
/**
|
||||
* Hours object with variable and function to generate the grid of planetary hours
|
||||
* @public {Object} moments - JSON object holding all the data returned from the swiss ephemeris calculations done by pmom.c
|
||||
|
|
@ -128,7 +134,7 @@ SL.Calendar = (function() {
|
|||
alert("Sorry, the calculation is limited to 60 days at the moment! Calculating the first 60 out of your desired "+days+" days!");
|
||||
days = 60;
|
||||
}
|
||||
$('#grid').empty();
|
||||
$('#grid .stoke').html('calculating...please wait');
|
||||
$('#download').remove();
|
||||
Filter.load();
|
||||
var files = document.getElementById('fileInput').files;
|
||||
|
|
@ -228,6 +234,7 @@ SL.Calendar = (function() {
|
|||
$('#calendar').isotope('destroy');
|
||||
NProgress.done();
|
||||
clearTimeout(timeout);
|
||||
$('#grid .stoke').empty();
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -298,7 +305,7 @@ SL.Calendar = (function() {
|
|||
});
|
||||
});
|
||||
var tagcloud = tags.join(" ").split(' ').sort();
|
||||
$('#houractions').append( '<br /><b>Tags</b><br />\n'+$.unique( tagcloud ).join(" "));
|
||||
$('#houractions').append( '<br /><b>Tags</b><br />\n'+unik( tagcloud ).join(" "));
|
||||
var title = SL.Astro.Logy.planet.day[mom.planetary.day.no+1]+"+Hour+"+(mom.planetary.hour.no+1);
|
||||
var desc = $('#hourinfos').html()+'\n\n'+$('#houractions').text();
|
||||
$('<a/>').attr('role', 'button').attr('target', '_blank').attr('href',
|
||||
|
|
@ -384,7 +391,7 @@ SL.Calendar = (function() {
|
|||
}
|
||||
});
|
||||
});
|
||||
var uniqtags = $.unique(tags);
|
||||
var uniqtags = unik(tags);
|
||||
// create DOM objects
|
||||
uniqtags.sort().forEach(function(tag) {
|
||||
tagline += '<li><input type="checkbox" class="actiontag" value=".'+tag+'" id="'+id+'-'+tag+'" /> '+tag+'</li>\n';
|
||||
|
|
@ -519,7 +526,7 @@ SL.Calendar = (function() {
|
|||
if (actionArray[i].hasOwnProperty('action') && actionArray[i].action) actions.push(actionArray[i]);
|
||||
}
|
||||
}
|
||||
if (tags) tagstring = $.unique(tags.join(" ").split(' ')).sort().join(" ");
|
||||
if (tags) tagstring = unik(tags.join(" ").split(' ')).sort().join(" ");
|
||||
actionstring = actionArray.map(function(el) { return idstring + el.id; }).join(" ");
|
||||
actions.sort();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -556,6 +556,78 @@ var module_saturn = {
|
|||
}
|
||||
};
|
||||
|
||||
//Defines Calendar Objects and Methods
|
||||
var module_ascendant = {
|
||||
|
||||
definitions: {
|
||||
core: true,
|
||||
name: "Rising Sign",
|
||||
group: {
|
||||
id: "astrology",
|
||||
text: "Astrology",
|
||||
info: "true"
|
||||
},
|
||||
actions: [
|
||||
[0],
|
||||
[{
|
||||
"id": "1",
|
||||
"action": "Aries Rising",
|
||||
"tags": "aries"
|
||||
}], [{
|
||||
"id": "2",
|
||||
"action": "Taurus Rising",
|
||||
"tags": "taurus"
|
||||
}], [{
|
||||
"id": "3",
|
||||
"action": "Gemini Rising",
|
||||
"tags": "gemini"
|
||||
}], [{
|
||||
"id": "4",
|
||||
"action": "Cancer Rising",
|
||||
"tags": "cancer"
|
||||
}], [{
|
||||
"id": "5",
|
||||
"action": "Leo Rising",
|
||||
"tags": "leo"
|
||||
}], [{
|
||||
"id": "6",
|
||||
"action": "Virgo Rising",
|
||||
"tags": "virgo"
|
||||
}], [{
|
||||
"id": "7",
|
||||
"action": "Libra Rising",
|
||||
"tags": "libra"
|
||||
}], [{
|
||||
"id": "8",
|
||||
"action": "Scorpio Rising",
|
||||
"tags": "scorpio"
|
||||
}], [{
|
||||
"id": "9",
|
||||
"action": "Sagittarius Rising",
|
||||
"tags": "sagittarius"
|
||||
}], [{
|
||||
"id": "10",
|
||||
"action": "Capricorn Rising",
|
||||
"tags": "capricorn"
|
||||
}], [{
|
||||
"id": "11",
|
||||
"action": "Aquarius Rising",
|
||||
"tags": "aquarius"
|
||||
}], [{
|
||||
"id": "12",
|
||||
"action": "Pisces Rising",
|
||||
"tags": "pisces"
|
||||
}]
|
||||
]
|
||||
},
|
||||
property: function(m) {
|
||||
return SL.Astro.Logy.getZodiac(m.ephemeris.asc.deg).sign;
|
||||
},
|
||||
calculate: function(definitions, property) {
|
||||
return definitions.actions[property];
|
||||
}
|
||||
};
|
||||
|
||||
//Defines Calendar Objects and Methods
|
||||
var module_aspects = {
|
||||
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
*/
|
||||
|
||||
//Defines Calendar Objects and Methods
|
||||
var module_decans_grecoroman = {
|
||||
var module_decans_solar = {
|
||||
|
||||
definitions: {
|
||||
name: "Greek + Latin Names",
|
||||
|
|
@ -276,3 +276,277 @@ var module_decans_grecoroman = {
|
|||
return definitions.actions[property];
|
||||
}
|
||||
};
|
||||
|
||||
//Defines Calendar Objects and Methods
|
||||
var module_decans_rising = {
|
||||
|
||||
definitions: {
|
||||
name: "Rising Decan",
|
||||
group: {
|
||||
id: "decans",
|
||||
text: "Decans",
|
||||
info: "true"
|
||||
},
|
||||
actions: [
|
||||
[0],
|
||||
[
|
||||
{
|
||||
"id":28,
|
||||
"action":"Aries 1 rising: Chontare / Senator",
|
||||
"tags":"chontare senator aries1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":29,
|
||||
"action":"Aries 2 rising: Chontachre / Senacher",
|
||||
"tags":"chontachre senacher aries2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":30,
|
||||
"action":"Aries 3 rising: Siket / Sentacher",
|
||||
"tags":"siket sentacher aries3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":31,
|
||||
"action":"Taurus 1 rising: Chôou / Suo",
|
||||
"tags":"choou suo taurus1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":32,
|
||||
"action":"Taurus 2 rising: Erô / Aryo",
|
||||
"tags":"ero aryo taurus2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":33,
|
||||
"action":"Taurus 3 rising: Hrombromare / Romanae",
|
||||
"tags":"hrombromare romanae taurus3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":34,
|
||||
"action":"Gemini 1 rising: Thosolk / Thesogar",
|
||||
"tags":"thosolk thesogar gemini1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":35,
|
||||
"action":"Gemini 2 rising: Ouare / Ver",
|
||||
"tags":"ouare ver gemini2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":36,
|
||||
"action":"Gemini 3 rising: Phouori / Tepis",
|
||||
"tags":"phouori tepis gemini3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":1,
|
||||
"action":"Cancer 1 rising: Sôthis / Sothis",
|
||||
"tags":"sothis sothis cancer1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":2,
|
||||
"action":"Cancer 2 rising: Sit / Sith",
|
||||
"tags":"sit sith cancer2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":3,
|
||||
"action":"Cancer 3 rising: Chnoumis / Thiumis",
|
||||
"tags":"chnoumis thiumis cancer3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":4,
|
||||
"action":"Leo 1 rising: Charchnoumis / Craumonis",
|
||||
"tags":"charchnoumis craumonis leo1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":5,
|
||||
"action":"Leo 2 rising: Êpê / Sic",
|
||||
"tags":"epe sic leo2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":6,
|
||||
"action":"Leo 3 rising: Phoupê / Futile",
|
||||
"tags":"phoupe futile leo3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":7,
|
||||
"action":"Virgo 1 rising: Tôm / Thumis",
|
||||
"tags":"tom thumis virgo1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":8,
|
||||
"action":"Virgo 2 rising: Ouestebkôt / Tophicus",
|
||||
"tags":"ouestebkot tophicus virgo2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":9,
|
||||
"action":"Virgo 3 rising: Aphoso / Afut",
|
||||
"tags":"aphoso afut virgo3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":10,
|
||||
"action":"Libra 1 rising: Souchôe / Seuichut",
|
||||
"tags":"souchoe seuichut libra1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":11,
|
||||
"action":"Libra 2 rising: Ptêchout / Sepisent",
|
||||
"tags":"ptechout sepisent libra2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":12,
|
||||
"action":"Libra 3 rising: Chontare / Senta",
|
||||
"tags":"chontare senta libra3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":13,
|
||||
"action":"Scorpio 1 rising: Stôchnêne / Sentacer",
|
||||
"tags":"stochnene sentacer scorpio1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":14,
|
||||
"action":"Scorpio 2 rising: Sesme / Tepsisen",
|
||||
"tags":"sesme tepsisen scorpio2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":15,
|
||||
"action":"Scorpio 3 rising: Sisieme / Sentineu",
|
||||
"tags":"sisieme sentineu scorpio3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":16,
|
||||
"action":"Sagittarius 1 rising: Hrêouô / Eregbuo",
|
||||
"tags":"hreouo eregbuo sagittarius1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":17,
|
||||
"action":"Sagittarius 2 rising: Sesme / Sagon",
|
||||
"tags":"sesme sagon sagittarius2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":18,
|
||||
"action":"Sagittarius 3 rising: Komme / Chenene",
|
||||
"tags":"komme chenene sagittarius3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":19,
|
||||
"action":"Capricorn 1 rising: Smat / Themeso",
|
||||
"tags":"smat themeso capricorn1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":20,
|
||||
"action":"Capricorn 2 rising: Srô / Epiemu",
|
||||
"tags":"sro epiemu capricorn2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":21,
|
||||
"action":"Capricorn 3 rising: Isrô / Omot",
|
||||
"tags":"isro omot capricorn3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":22,
|
||||
"action":"Aquarius 1 rising: Ptiau / Oro",
|
||||
"tags":"ptiau oro aquarius1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":23,
|
||||
"action":"Aquarius 2 rising: Aue / Cratero",
|
||||
"tags":"aue cratero aquarius2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":24,
|
||||
"action":"Aquarius 3 rising: Ptêbuou / Tepis",
|
||||
"tags":"ptebuou tepis aquarius3"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":25,
|
||||
"action":"Pisces 1 rising: Biou / Acha",
|
||||
"tags":"biou acha pisces1"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":26,
|
||||
"action":"Pisces 2 rising: Chontare / Tepibui",
|
||||
"tags":"chontare tepibui pisces2"
|
||||
}
|
||||
],
|
||||
[
|
||||
{
|
||||
"id":27,
|
||||
"action":"Pisces 3 rising: Ptibiou / Uiu",
|
||||
"tags":"ptibiou uiu pisces3"
|
||||
}
|
||||
]
|
||||
]
|
||||
},
|
||||
property: function(m) {
|
||||
return SL.Astro.Logy.getZodiac(m.ephemeris.asc.deg).decan;
|
||||
},
|
||||
calculate: function(definitions, property) {
|
||||
return definitions.actions[property];
|
||||
}
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue