Index: /trunk/data/validator/opening_hours.js =================================================================== --- /trunk/data/validator/opening_hours.js (revision 7045) +++ /trunk/data/validator/opening_hours.js (revision 7046) @@ -1,6 +1,5 @@ (function (root, factory) { - //====================================================================== - // Constants - //====================================================================== + // constants (holidays, error correction) {{{ + // holidays {{{ var holidays = { 'fr': { @@ -1104,31 +1103,273 @@ }, }, + 'ca': { + 'PH': { // https://en.wikipedia.org/wiki/Public_holidays_in_Canada + "New Year's Day" : [ 1, 1 ], + "Good Friday" : [ 'easter', -2 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Christmas Day" : [ 12, 25 ] + }, + 'Alberta': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Alberta Family Day" : [ 'firstFebruaryMonday', 14 ], + "Good Friday" : [ 'easter', -2 ], + "Easter Monday" : [ 'easter', 1 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Heritage Day" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ], + "Boxing Day" : [ 12, 26 ] + }, + }, + 'British Columbia': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Family Day" : [ 'firstFebruaryMonday', 7 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "British Columbia Day" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ] + }, + }, + 'Manitoba': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Louis Riel Day" : [ 'firstFebruaryMonday', 14 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Civic Holiday" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ] + }, + }, + 'New Brunswick': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "New Brunswick Day" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ], + "Boxing Day" : [ 12, 26 ] + }, + }, + 'Newfoundland and Labrador': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Saint Patrick's Day" : [ 3, 17 ], + "Good Friday" : [ 'easter', -2 ], + "Saint George's Day" : [ 4, 23 ], + "Discovery Day" : [ 6, 24 ], + "Memorial Day" : [ 7, 1 ], + "Orangemen's Day" : [ 7, 12 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Armistice Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ] + }, + }, + 'Northwest Territories': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "National Aboriginal Day" : [ 6, 21 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Civic Holiday" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ] + }, + }, + 'Nova Scotia': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Natal Day" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ], + "Boxing Day" : [ 12, 26 ] + }, + }, + 'Nunavut': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Nunavut Day" : [ 7, 9 ], + "Civic Holiday" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ] + }, + }, + 'Ontario': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Family Day" : [ 'firstFebruaryMonday', 14 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "August Civic Public Holiday" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ], + "Boxing Day" : [ 12, 26 ] + }, + }, + 'Prince Edward Island': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Islander Day" : [ 'firstFebruaryMonday', 14 ], + "Good Friday" : [ 'easter', -2 ], + "Easter Monday" : [ 'easter', 1 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Civic Holiday" : [ 'firstAugustMonday', 0 ], + "Gold Cup Parade Day" : [ 'firstAugustMonday', 18 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ], + "Boxing Day" : [ 12, 26 ] + }, + }, + 'Quebec': { + 'PH': { + "Jour de l'an" : [ 1, 1 ], + "Vendredi saint" : [ 'easter', -2 ], + "Lundi de Pâques" : [ 'easter', 1 ], + "Journée nationale des patriotes" : [ 'victoriaDay', 0 ], + "Fête nationale du Québec" : [ 6, 24 ], + "Fête du Canada" : [ 'canadaDay', 0 ], + "Fête du Travail" : [ 'firstSeptemberMonday', 0 ], + "Jour de l'Action de grâce" : [ 'firstOctoberMonday', 7 ], + "Noël" : [ 12, 25 ] + }, + }, + 'Saskatchewan': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Family Day" : [ 'firstFebruaryMonday', 14 ], + "Good Friday" : [ 'easter', -2 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Saskatchewan Day" : [ 'firstAugustMonday', 0 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ] + }, + }, + 'Yukon': { + 'PH': { + "New Year's Day" : [ 1, 1 ], + "Heritage Day" : [ 'lastFebruarySunday', -2 ], + "Good Friday" : [ 'easter', -2 ], + "Easter Monday" : [ 'easter', 1 ], + "Victoria Day" : [ 'victoriaDay', 0 ], + "Canada Day" : [ 'canadaDay', 0 ], + "Discovery Day" : [ 'firstAugustMonday', 14 ], + "Labour Day" : [ 'firstSeptemberMonday', 0 ], + "Thanksgiving" : [ 'firstOctoberMonday', 7 ], + "Remembrance Day" : [ 11, 11 ], + "Christmas Day" : [ 12, 25 ], + "Boxing Day" : [ 12, 26 ] + }, + }, + }, + 'ua': { + 'PH': { // http://uk.wikipedia.org/wiki/%D0%A1%D0%B2%D1%8F%D1%82%D0%B0_%D1%82%D0%B0_%D0%BF%D0%B0%D0%BC%27%D1%8F%D1%82%D0%BD%D1%96_%D0%B4%D0%BD%D1%96_%D0%B2_%D0%A3%D0%BA%D1%80%D0%B0%D1%97%D0%BD%D1%96 + "Новий рік" : [ 1, 1 ], + "Різдво" : [ 1, 7 ], + "Міжнародний жіночий день" : [ 3, 8 ], + "Великдень" : [ 'orthodox easter', 1 ], + "День Праці 1" : [ 5, 1 ], + "День Праці 2" : [ 5, 2 ], + "День Перемоги" : [ 5, 9 ], + "День Конституції України" : [ 6, 28 ], + "День Незалежності України" : [ 8, 24 ], + } + }, + 'si': { + 'PH': { // http://www.vlada.si/o_sloveniji/politicni_sistem/prazniki/ + 'novo leto' : [ 1, 1 ], + 'Prešernov dan, slovenski kulturni praznik' : [ 2, 8 ], + 'velikonočna nedelja' : [ 'easter', 0 ], + 'velikonočni ponedeljek' : [ 'easter', 1 ], + 'dan upora proti okupatorju' : [ 4, 27 ], + 'praznik dela 1' : [ 5, 1 ], + 'praznik dela 2' : [ 5, 2 ], + 'binkoštna nedelja - binkošti' : [ 'easter', 49 ], + 'dan državnosti' : [ 6, 25 ], + 'Marijino vnebovzetje' : [ 8, 15 ], + 'dan reformacije' : [ 10, 31 ], + 'dan spomina na mrtve' : [ 11, 1 ], + 'božič' : [ 12, 25 ], + 'dan samostojnosti in enotnosti' : [ 12, 26 ], + }, + }, }; - - //---------------------------------------------------------------------------- - // error correction - // Taken form http://www.netzwolf.info/j/osm/time_domain.js - // Credits go to Netzwolf + // }}} + + // error correction {{{ + // Taken form http://www.netzwolf.info/j/osm/time_domain.js + // Credits go to Netzwolf // - // Key to word_error_correction is the token name except wrong_words - //---------------------------------------------------------------------------- + // Key to word_error_correction is the token name except wrong_words var word_error_correction = { wrong_words: { 'Assuming "" for ""': { - spring: 'Mar-May', - summer: 'Jun-Aug', - autumn: 'Sep-Nov', - winter: 'Dec-Feb', + spring: 'Mar-May', + summer: 'Jun-Aug', + autumn: 'Sep-Nov', + winter: 'Dec-Feb', + // morning: '08:00-12:00', + // evening: '13:00-18:00', + '_': '-', + 'daytime': 'sunrise-sunset', }, 'Bitte benutze die englische Schreibweise "" für "".': { sommer: 'summer', + 'werktag': 'Mo-Fr', + 'werktags': 'Mo-Fr', }, 'Bitte benutze "" für "". Beispiel: "Mo-Fr 08:00-12:00; Tu off"': { ruhetag: 'off', ruhetage: 'off', geschlossen: 'off', + ausser: 'off', + außer: 'off', + }, 'Neem de engelse afkorting "" voor "" alstublieft.': { + 'gesloten': 'off', + 'feestdag': 'PH', }, 'Assuming "" for "". Please avoid using "workday": http://wiki.openstreetmap.org/wiki/Talk:Key:opening_hours#need_syntax_for_holidays_and_workingdays': { // // Used around 260 times but the problem is, that work day might be different in other countries. - wd: 'Mo-Fr', - weekday: 'Mo-Fr', - weekdays: 'Mo-Fr', + 'wd': 'Mo-Fr', + 'weekday': 'Mo-Fr', + 'weekdays': 'Mo-Fr', + 'vardagar': 'Mo-Fr', + }, 'Please use notation something like "Mo off" instead "".': { + except: 'off', }, 'Please ommit "" or use a colon instead: "12:00-14:00".': { h: '', @@ -1138,31 +1379,74 @@ hrs: '', hours: '', - }, 'Please ommit "". You might want to express open end which can be specified as "12:00+" for example': { + }, 'Please ommit "". The key must not be in the value.': { + 'opening_hours=': '', + }, 'Please ommit "". You might want to express open end which can be specified as "12:00+" for example.': { from: '', + }, 'You can use notation "" for "". You might want to express open end which can be specified as "12:00+" for example.': { + '-late': '+', }, 'Please use notation "" for "". If the times are unsure or vary consider a comment e.g. 12:00-14:00 "only on sunshine".': { '~': '-', '～': '-', + }, 'Please use notation "" for "". Fallback rule: 12:00-14:00 || "call us"': { + 'otherwise': '||', + }, 'You can use notation "" for "" temporally if the syntax will still be valid.': { + '?': 'unknown "please add this if known"', }, 'Please use notation "" for "".': { + '→': '-', '–': '-', - 'ー': '-', + '−': '-', + '=': '-', + 'ー': '-', to: '-', - till: '-', + 'до': '-', + a: '-', // language unknown + as: '-', // language unknown + 'á': '-', // language unknown + 'ás': '-', // language unknown + 'à': '-', // language unknown + 'às': '-', // language unknown + 'ate': '-', // language unknown + 'till': '-', + 'til': '-', + 'until': '-', + 'through': '-', and: ',', '&': ',', '：': ':', - daily: 'Mo-Su', - everyday: 'Mo-Su', + '°°': ':00', + 'daily': 'Mo-Su', + 'everyday': 'Mo-Su', + 'every day': 'Mo-Su', always: '24/7', nonstop: '24/7', - midnight: '00:00', + '24x7': '24/7', + 'anytime': '24/7', + 'all day': '24/7', + 'all days': 'Mo-Su', + 'every day': 'Mo-Su', + '7days': 'Mo-Su', + '7j/7': 'Mo-Su', // I guess that it means that + '7/7': 'Mo-Su', // I guess that it means that + '7 days': 'Mo-Su', + '7 days a week': 'Mo-Su', + 'midnight': '00:00', holiday: 'PH', holidays: 'PH', + 'public holidays': 'PH', + 'public holiday': 'PH', // summerholiday: 'SH', // summerholidays: 'SH', - }, 'Please use time format in 24 hours notation ("").': { - pm: '', - am: '', + weekend: 'Sa,Su', + weekends: 'Sa,Su', + 'daylight': 'sunrise-sunset', + 'оff': 'off', // Russian o + }, 'Please use time format in 24 hours notation (""). If PM is used you might have to convert the hours to the 24 hours notation.': { + 'pm': '', + 'рм': '', + 'am': '', + 'ам': '', }, 'Bitte verzichte auf "".': { - uhr: '', + 'uhr': '', + 'geöffnet': '', }, 'Bitte verzichte auf "". Sie möchten eventuell eine Öffnungszeit ohne vorgegebenes Ende angeben. Beispiel: "12:00+"': { ab: '', @@ -1183,4 +1467,5 @@ 'et': ',', 'à': '-', + 'jours fériés': 'PH', }, 'Neem de engelse afkorting "" voor "" alstublieft.': { feestdag: 'PH', @@ -1204,4 +1489,5 @@ dec: 11, }, 'Please use the English abbreviation "" for "".': { + 'jänner': 0, // Austria january: 0, february: 1, @@ -1281,4 +1567,5 @@ wednesdays: 3, thu: 4, + thur: 4, thursday: 4, thursdays: 4, @@ -1294,4 +1581,5 @@ son: 0, sonntag: 0, + 'sonn-': 0, sonntags: 0, montag: 1, @@ -1334,5 +1622,6 @@ zo: 0, zon: 0, - zontag: 0, + zontag: 0, // correct? + zondag: 0, maandag: 1, din: 2, @@ -1380,12 +1669,14 @@ 'senin': 6, // Swedish - 'söndag': 0, - 'måndag': 1, - ma: 1, - 'tisdag': 2, - 'onsdag': 3, - 'torsdag': 4, - 'fredag': 5, - 'lördag': 6, + 'söndag': 0, + 'söndagar': 0, + 'måndag': 1, + 'ma': 1, + 'tisdag': 2, + 'onsdag': 3, + 'torsdag': 4, + 'fredag': 5, + 'lördag': 6, + 'lördagar': 6, // Polish 'niedziela': 0, 'niedz': 0, 'n': 0, 'ndz': 0, @@ -1396,4 +1687,29 @@ 'piątek': 5, 'piatek': 5, 'pt': 5, 'sobota': 6, 'sob': 6, // 'so': 6 // abbreviation also used in German + // Russian + 'воскресенье' : 0, + 'Вс' : 0, + "voskresen'ye": 0, + 'понедельник' : 1, + 'Пн' : 1, + "ponedel'nik" : 1, + 'вторник' : 2, + 'vtornik' : 2, + 'среда' : 3, + 'sreda' : 3, + 'четверг' : 4, + 'chetverk' : 4, + 'пятница' : 5, + 'pyatnitsa' : 5, + 'суббота' : 6, + 'subbota' : 6, + // Danish + 'søndag' : 0, + 'mandag' : 1, + 'tirsdag': 2, + 'onsdag' : 3, + 'torsdag': 4, + 'fredag' : 5, + 'lørdag' : 6, }, }, @@ -1401,15 +1717,15 @@ timevar: { // Special time variables which actual value depends on the date and the position of the facility. 'default': { - sunrise: 'sunrise', - sunset: 'sunset', - dawn: 'dawn', - dusk: 'dusk', + 'sunrise': 'sunrise', + 'sunset': 'sunset', + 'dawn': 'dawn', + 'dusk': 'dusk', }, 'Please use notation "" for "".': { - sundown: 'sunset', + 'sundown': 'sunset', }, 'Bitte benutze die Schreibweise "" für "".': { 'morgendämmerung': 'dawn', 'abenddämmerung': 'dusk', - sonnenaufgang: 'sunrise', - sonnenuntergang: ',', + 'sonnenaufgang': 'sunrise', + 'sonnenuntergang': 'sunset', }, }, @@ -1417,11 +1733,14 @@ 'event': { // variable events 'default': { - easter: 'easter', + 'easter': 'easter', }, 'Bitte benutze die Schreibweise "" für "".': { - ostern: 'easter', + 'ostern': 'easter', }, }, }; - + // }}} + // }}} + + // make the library accessible for the outside world {{{ if (typeof exports === 'object') { // For nodejs @@ -1432,6 +1751,8 @@ root.opening_hours = factory(root.SunCalc, holidays, word_error_correction); } + /// }}} }(this, function (SunCalc, holidays, word_error_correction) { return function(value, nominatiomJSON, oh_mode) { + // short constants {{{ var word_value_replacement = { // if the correct values can not be calculated dawn : 60 * 5 + 30, @@ -1456,5 +1777,7 @@ var msec_in_day = 1000 * 60 * minutes_in_day; var msec_in_week = msec_in_day * 7; - + // }}} + + // The big picture -- How does this library work? {{{ //====================================================================== // Constructor - entry to parsing code @@ -1476,12 +1799,13 @@ // - Tokenize // Foreach block: - // - Run toplevel (block) parser - // - Which calls subparser for specific selector types + // - Run top-level (block) parser + // - Which calls sub parser for specific selector types // - Which produce selector functions - - + // }}} + + // constructor parameters {{{ // Evaluate additional information which can be given. They are - // required to reasonably calculate 'sunrise' and so on and to use the - // correct holidays. + // required to reasonably calculate 'sunrise' and to use the correct + // holidays. var location_cc, location_state, lat, lon; if (typeof nominatiomJSON != 'undefined') { @@ -1498,7 +1822,7 @@ } - // 0: time ranges (opening_hours, lit, …) default - // 1: points in time (collection_times, service_times, …) - // 2: both (time ranges and points in time) + // 0: time ranges (default), tags: opening_hours, lit, … + // 1: points in time + // 2: both (time ranges and points in time), tags: collection_times, service_times if (typeof oh_mode == 'undefined') { oh_mode = 0; @@ -1506,5 +1830,7 @@ throw 'The third constructor parameter is oh_mode and must be a number (0, 1 or 2)' } - + // }}} + + // put tokenized blocks into list {{{ if (value.match(/^(\s*;?\s*)+$/)) throw 'Value contains nothing meaningful which can be parsed'; @@ -1516,5 +1842,5 @@ // console.log(JSON.stringify(tokens, null, '\t')); var prettified_value = ''; - var used_subparsers = {}; // Used sub parsers for one block, will be asdreset for each block. Declared as global, because it is manipulation inside much sub parsers. + var used_subparsers = {}; // Used sub parsers for one block, will be reset for each block. Declared as global, because it is manipulation inside various sub parsers. var week_stable = true; @@ -1576,4 +1902,5 @@ selectors.date.push(selectors.weekday); + // console.log('weekday: ' + JSON.stringify(selectors.weekday, null, '\t')); blocks.push(selectors); @@ -1605,6 +1932,7 @@ } while (continue_at) } - - // Tokenization function: Splits string into parts. + // }}} + + // Tokenization function: Splits string into parts. {{{ // output: array of arrays of pairs [content, type] function tokenize(value) { @@ -1616,5 +1944,5 @@ while (value != '') { var tmp; - if (tmp = value.match(/^(?:week\b|open|unknown)/i)) { + if (tmp = value.match(/^(?:week\b|open\b|unknown)/i)) { // reserved word curr_block_tokens.push([tmp[0].toLowerCase(), tmp[0].toLowerCase(), value.length ]); @@ -1636,5 +1964,5 @@ curr_block_tokens.push([tmp[0].toLowerCase(), 'calcday', value.length ]); value = value.substr(tmp[0].length); - } else if (tmp = value.match(/^(&|–|ー|~|～|：|[a-zA-ZäÄàÀéÉ]+\b)\.?/i)) { + } else if (tmp = value.match(/^(&|_|→|–|−|=|opening_hours=|ー|\?|~|～|：|°°|25x7|7[ ]?days( a week|)|all days?|every day|-late|public holidays?|7j?\/7|every day|до|рм|ам|jours fériés|sonn-|[a-zäößàáéøčěíúýřПнВсо]+\b)\.?/i)) { // Handle all remaining words with error tolerance var correct_val = returnCorrectWordOrToken(tmp[1].toLowerCase(), value.length); @@ -1702,6 +2030,8 @@ return all_tokens; } - - // error correction/tolerance + // }}} + + // error correction/tolerance function {{{ + // Go through word_error_correction hash and get correct value back. function returnCorrectWordOrToken(word, value_length) { for (var token_name in word_error_correction) { @@ -1718,6 +2048,7 @@ for (correct_abbr in word_error_correction[token_name]['default']) { if (word_error_correction[token_name]['default'][correct_abbr] == val) - break; + break; // FIXME } + // FIXME if (token_name != 'timevar') { // normally written in lower case correct_abbr = correct_abbr.charAt(0).toUpperCase() + correct_abbr.slice(1); @@ -1733,10 +2064,11 @@ } } - + // }}} + + // return warnings as list {{{ function getWarnings(it) { - if (typeof it == 'object') { // getWarnings was called in a state without critical errors. We can do extended tests. - // Check if 24/7 is used and it does not mean 24/7 because there are other rules. This can be avoided. + // Check if 24/7 is used and it does not mean 24/7 because there are other blocks. var has_advanced = it.advance(); @@ -1756,6 +2088,7 @@ return warnings; } - - // Function to check token array for specific pattern + // }}} + + // Function to check token array for specific pattern {{{ function matchTokens(tokens, at /*, matches... */) { if (at + arguments.length - 2 > tokens.length) @@ -1768,5 +2101,7 @@ return true; } - + // }}} + + // Generate selector wrapper with time offset {{{ function generateDateShifter(func, shift) { return function(date) { @@ -1778,8 +2113,7 @@ } } - - //====================================================================== - // Top-level parser - //====================================================================== + // }}} + + // Top-level parser {{{ function parseGroup(tokens, at, selectors, nblock, conf) { var prettified_group_value = ''; @@ -1793,6 +2127,7 @@ at = parseWeekdayRange(tokens, at, selectors); } else if (matchTokens(tokens, at, '24/7')) { - // selectors.time.push(function(date) { return [true]; }); + selectors.time.push(function(date) { return [true]; }); // Not needed. If there is no selector it automatically matches everything. + // WRONG: This only works if there is no other selector in this selector group ... at++; } else if (matchTokens(tokens, at, 'holiday')) { @@ -1826,5 +2161,5 @@ // This provides compatibility with the syntax proposed by Netzwolf: // http://wiki.openstreetmap.org/wiki/Key:opening_hours:specification - if (!done_with_warnings && matchTokens(tokens, at-1, 'weekday') || matchTokens(tokens, at-1, 'holiday')) + if (!done_with_warnings && (matchTokens(tokens, at-1, 'weekday') || matchTokens(tokens, at-1, 'holiday'))) parsing_warnings.push([nblock, at, 'Please don’t use ":" after ' + tokens[at-1][1] + '.']); @@ -1836,5 +2171,5 @@ || matchTokens(tokens, at, '(', 'timevar') || matchTokens(tokens, at, 'number', '-')) { - at = parseTimeRange(tokens, at, selectors); + at = parseTimeRange(tokens, at, selectors, false); used_subparsers['time ranges'].push(at); @@ -1881,6 +2216,7 @@ } } else { // block starts with comment - // selectors.time.push(function(date) { return [true]; }); + selectors.time.push(function(date) { return [true]; }); // Not needed. If there is no selector it automatically matches everything. + // WRONG: This only works if there is no other selector in this selector group ... selectors.meaning = false; selectors.unknown = true; @@ -1935,4 +2271,5 @@ + ' Equal selector types can (and should) always be written in conjunction separated by comma or something.' + ' Example for time ranges "12:00-13:00,15:00-18:00".' + + ' Example for weekdays "Mo-We,Fr".' ) + ' Rules can be separated by ";".' ] @@ -1944,9 +2281,169 @@ return at; } - - //====================================================================== - // Time range parser (10:00-12:00,14:00-16:00) - //====================================================================== - function parseTimeRange(tokens, at, selectors) { + // }}} + + // helper functions for sub parser {{{ + // for given date, returns date moved to the start of specified day minute + function dateAtDayMinutes(date, minutes) { + return new Date(date.getFullYear(), date.getMonth(), date.getDate(), 0, minutes); + } + + // for given date, returns date moved to the specific day of week + function dateAtNextWeekday(date, day) { + var delta = day - date.getDay(); + return new Date(date.getFullYear(), date.getMonth(), date.getDate() + delta + (delta < 0 ? 7 : 0)); + } + + function indexOf(needle) { + if(typeof Array.prototype.indexOf === 'function') { + indexOf = Array.prototype.indexOf; + } else { + indexOf = function(needle) { + var i = -1, index = -1; + for(i = 0; i < this.length; i++) { + if(this[i] === needle) { + index = i; + break; + } + } + return index; + }; + } + return indexOf.call(this, needle); + } + + // Numeric list parser (1,2,3-4,-1), used in weekday parser above + function parseNumRange(tokens, at, func) { + for (; at < tokens.length; at++) { + if (matchTokens(tokens, at, 'number', '-', 'number')) { + // Number range + func(tokens[at][0], tokens[at+2][0], at); + at += 3; + } else if (matchTokens(tokens, at, '-', 'number')) { + // Negative number + func(-tokens[at+1][0], -tokens[at+1][0], at); + at += 2 + } else if (matchTokens(tokens, at, 'number')) { + // Single number + func(tokens[at][0], tokens[at][0], at); + at++; + } else { + throw formatWarnErrorMessage(nblock, at + matchTokens(tokens, at, '-'), + 'Unexpected token in number range: ' + tokens[at][1]); + } + + if (!matchTokens(tokens, at, ',')) + break; + } + + return at; + } + + function getConstrainedWeekday(tokens, at) { + var number = 0; + var endat = parseNumRange(tokens, at, function(from, to, at) { + + // bad number + if (from == 0 || from < -5 || from > 5) + throw formatWarnErrorMessage(nblock, at, + 'Number between -5 and 5 (except 0) expected'); + + if (from == to) { + if (number != 0) + throw formatWarnErrorMessage(nblock, at, + 'You can not use a more than one constrained weekday in a month range'); + number = from; + } else { + throw formatWarnErrorMessage(nblock, at+2, + 'You can not use a range of constrained weekdays in a month range'); + } + }); + + if (!matchTokens(tokens, endat, ']')) + throw formatWarnErrorMessage(nblock, endat, '"]" expected.'); + + return [ number, endat + 1 ]; + } + + // Check if period is ok. Period 0 or 1 don’t make much sense. + function checkPeriod(at, period, period_type, parm_string) { + if (done_with_warnings) + return; + + if (period === 0) { + throw formatWarnErrorMessage(nblock, at, + 'You can not use '+ period_type +' ranges with period equals zero.'); + } else if (period === 1) { + if (typeof parm_string == 'string' && parm_string == 'no_end_year') + parsing_warnings.push([nblock, at, + 'Please don’t use '+ period_type +' ranges with period equals one.' + + ' If you want to express that a facility is open starting from a year without limit use "+".']); + else + parsing_warnings.push([nblock, at, + 'Please don’t use '+ period_type +' ranges with period equals one.']); + } + } + + function getDateForConstrainedWeekday(year, month, weekday, constrained_weekday, add_days) { + var tmp_date = dateAtNextWeekday( + new Date(year, month + (constrained_weekday[0] > 0 ? 0 : 1), 1), weekday); + + tmp_date.setDate(tmp_date.getDate() + (constrained_weekday[0] + (constrained_weekday[0] > 0 ? -1 : 0)) * 7); + + if (typeof add_days != 'undefined' && add_days[1]) + tmp_date.setDate(tmp_date.getDate() + add_days[0]); + + return tmp_date; + } + + function formatWarnErrorMessage(nblock, at, message) { + var pos = 0; + if (nblock == -1) { // Usage of block index not required because we do have access to value.length. + pos = value.length - at; + } else { // Issue accrued at a later time, position in string needs to be reconstructed. + if (typeof tokens[nblock][0][at] == 'undefined') { + pos = value.length; + if (typeof tokens[nblock][0][tokens[nblock][0].length-1] != 'undefined') { + // pos -= tokens[nblock][0][tokens[nblock][0].length-1][2]; + console.warn("FIXME"); + } + } else { + pos = value.length; + if (typeof tokens[nblock][0][at+1] != 'undefined') { + pos -= tokens[nblock][0][at+1][2]; + } else if (typeof tokens[nblock][2] != 'undefined') { + pos -= tokens[nblock][2]; + } else { + } + } + } + return value.substring(0, pos) + ' <--- (' + message + ')'; + } + + // check if date is valid + function isValidDate(month, day, nblock, at) { + // month == 0 is Jan + + // May use this instead. Does not say, what is wrong as good was implementation below. + // var testDate = new Date(year, month, day); + // if (testDate.getDate() != day || testDate.getMonth() != month || testDate.getFullYear() != year) { + // console.error('date not valid'); + // } + + // https://en.wikipedia.org/wiki/Month#Julian_and_Gregorian_calendars + if (day < 1 || day > 31) + throw formatWarnErrorMessage(nblock, at, 'Day must be between 1 and 31.'); + if ((month==3 || month==5 || month==8 || month==10) && day==31) + throw formatWarnErrorMessage(nblock, at, 'Month ' + months[month] + " doesn't have 31 days.!"); + if (month == 1 && day == 30) + throw formatWarnErrorMessage(nblock, at, 'Month ' + months[1]+ " either has 28 or 29 days (leap years)."); + } + // }}} + + // Time range parser (10:00-12:00,14:00-16:00) {{{ + // + // extended_open_end: