opening_hours 3.8.0-dev → 3.9.0-beta.0

package/package.json

@@ -4,15 +4,18 @@
   "typings": "./types/index.d.ts",
   "types": "./types/index.d.ts",
   "description": "Library to parse and process opening_hours tag from OpenStreetMap data",
-  "version": "3.8.0-dev",
+  "version": "3.9.0-beta.0",
   "homepage": "https://github.com/opening-hours/opening_hours.js",
   "author": "Dmitry Marakasov <amdmi3@amdmi3.ru>",
   "maintainers": [
     "Robin Schneider <ypid@riseup.net>"
   ],
+  "contributors": [
+    "https://github.com/opening-hours/opening_hours.js/graphs/contributors"
+  ],
   "repository": {
     "type": "git",
-    "url": "https://github.com/opening-hours/opening_hours.js"
+    "url": "git+https://github.com/opening-hours/opening_hours.js.git"
   },
   "bugs": "https://github.com/opening-hours/opening_hours.js/issues?state=open",
   "keywords": [
@@ -36,52 +39,53 @@
     "build": "make build",
     "test-quick": "make check",
     "test": "make check-full",
-    "eslint": "eslint src/**/*.js types/*.d.ts",
+    "lint": "eslint",
+    "lint:fix": "eslint --fix",
     "osm-tag-data-check": "make osm-tag-data-check",
     "benchmark": "make benchmark",
     "interactive_testing": "make run-interactive_testing",
     "regex_search": "make run-regex_search",
-    "_postinstall": "husky install",
+    "prepare": "husky",
     "prepublishOnly": "pinst --disable",
     "postpublish": "pinst --enable",
     "readme": "doctoc README.md --title \"## Table of Contents\"",
-    "check-updates": " npm-check-updates --reject colors --upgrade"
+    "check-updates": "npm-check-updates --reject colors --upgrade"
   },
   "dependencies": {
-    "i18next": "^20.3.4",
-    "i18next-browser-languagedetector": "^6.1.2",
-    "suncalc": "^1.8.0"
+    "i18next": "^24.2.3",
+    "i18next-browser-languagedetector": "^8.0.4",
+    "suncalc": "^1.9.0"
   },
   "devDependencies": {
-    "@rollup/plugin-commonjs": "^19.0.1",
-    "@rollup/plugin-json": "^4.1.0",
-    "@rollup/plugin-node-resolve": "^13.0.3",
-    "@rollup/plugin-yaml": "^3.0.0",
-    "@typescript-eslint/eslint-plugin": "^4.28.4",
-    "@typescript-eslint/parser": "^4.28.4",
-    "assert": "^2.0.0",
-    "colors": "^0.6.2",
+    "@eslint/js": "^9.24.0",
+    "@rollup/plugin-commonjs": "^28.0.3",
+    "@rollup/plugin-json": "^6.1.0",
+    "@rollup/plugin-node-resolve": "^16.0.1",
+    "@rollup/plugin-terser": "^0.4.4",
+    "@rollup/plugin-yaml": "^4.1.2",
+    "colors": "^1.4.0",
     "country-language": "^0.1.7",
-    "doctoc": "^2.0.1",
-    "esbuild": "^0.12.15",
-    "eslint": "^7.31.0",
-    "full-icu": "^1.3.4",
-    "glob": "^7.1.7",
-    "https": "^1.0.0",
-    "husky": "^7.0.1",
-    "js-yaml": "^4.1.0",
+    "doctoc": "^2.2.1",
+    "eslint": "^9.24.0",
+    "full-icu": "^1.5.0",
+    "glob": "^11.0.1",
+    "globals": "^16.0.0",
+    "husky": "^9.1.7",
     "line-reader": "^0.4.0",
-    "npm-check-updates": "^11.8.3",
+    "moment": "^2.30.1",
+    "npm-check-updates": "^17.1.16",
     "optimist": "^0.6.1",
-    "package-json-validator": "^0.6.3",
-    "pinst": "^2.1.6",
-    "rollup": "^2.53.3",
-    "sprintf-js": "1.1.2",
-    "terser": "^5.7.1",
-    "timekeeper": "^2.2.0",
-    "typescript": "^4.3.5"
+    "package-json-validator": "^0.10.1",
+    "pinst": "^3.0.0",
+    "rollup": "^4.39.0",
+    "sprintf-js": "1.1.3",
+    "terser": "^5.39.0",
+    "timekeeper": "^2.3.1",
+    "typescript": "^5.8.3",
+    "typescript-eslint": "^8.29.0",
+    "yaml": "^2.7.1"
   },
   "engines": {
-    "node": ">=10.0.0"
+    "node": ">=12"
   }
 }

package/site/js/helpers.js

@@ -1,3 +1,5 @@
+/* global $, , default_lat, default_lon, i18next, jQuery, mapCountryToLanguage, opening_hours, OpeningHoursTable, specification_url, YoHoursChecker */
+
 /* Constants {{{ */
 var nominatim_api_url = 'https://nominatim.openstreetmap.org/reverse';
 // var nominatim_api_url = 'https://open.mapquestapi.com/nominatim/v1/reverse.php';
@@ -15,7 +17,7 @@ var evaluation_tool_colors = {
 // FIXME: Warning in console. Encoding stuff.
 function josm(url_param) {
     var xhr = new XMLHttpRequest();
-    xhr.open('GET', 'https://localhost:8111/' + url_param, true);      // true makes this call asynchronous
+    xhr.open('GET', 'http://localhost:8111/' + url_param, true);      // true makes this call asynchronous
     xhr.onreadystatechange = function () {    // need eventhandler since our call is async
         if ( xhr.status !== 200 ) {
             alert(i18next.t('texts.JOSM remote conn error'));
@@ -189,9 +191,10 @@ function Evaluate (offset, reset) {
         var it = oh.getIterator(date);
     } catch (err) {
         crashed = err;
-        show_warnings_or_errors.innerHTML = '<p class="error">' + i18next.t('texts.filter.error') + ':<br />'
-            + '<textarea rows="' + crashed.split('\n').length + 1 + '" style="width: 100%" name="WarnErrors" readonly="readonly">' + crashed
-            + '</textarea></p>';
+        show_warnings_or_errors.innerHTML = `
+            <div class="error"> ${i18next.t('texts.filter.error')}
+                <div class="warning_error_message"> ${crashed} </div>
+            </div>`;
         show_time_table.innerHTML = '';
         show_results.innerHTML    = '';
     }
@@ -268,7 +271,7 @@ function Evaluate (offset, reset) {
         }
         value_explanation += '</p></div>';
         if (YoHoursChecker.canRead(value)) {
-            value_explanation = i18next.t('texts.refer to yohours', { href: 'http://github.pavie.info/yohours/?oh=' + value })
+            value_explanation = i18next.t('texts.refer to yohours', { href: 'https://projets.pavie.info/yohours/?oh=' + value })
             + '<br>'
             + value_explanation;
         }
@@ -331,15 +334,18 @@ function Evaluate (offset, reset) {
 
         var warnings = oh.getWarnings();
         if (warnings.length > 0) {
-            show_warnings_or_errors.innerHTML += '<p class="warning">' + i18next.t('texts.filter.error') + ':<br />'
-                + '<textarea rows="' + (warnings.length + 1)
-                + '" style="width: 100%" name="WarnErrors" readonly="readonly">' + warnings.join('\n')
-                + '</textarea></p>';
+            show_warnings_or_errors.innerHTML += `
+            <div class="warning"> ${i18next.t('texts.filter.error')}
+                <div class="warning_error_message"> ${warnings.join('\n')} </div>
+            </div>`;
         }
 
         if (prettified.length > 255) {
-            show_warnings_or_errors.innerHTML += '<p>' + i18next.t('texts.value to long for osm',
-                { pretLength: prettified.length, valLength: value.length, maxLength: 255 }) + '</p>';
+            show_warnings_or_errors.innerHTML += `
+            <div class="warning"> ${i18next.t('texts.filter.error')}
+                <div class="warning_error_message"> ${i18next.t('texts.value to long for osm',
+                    { pretLength: prettified.length, valLength: value.length, maxLength: 255 })} </div>
+            </div>`;
         }
 
         show_time_table.innerHTML += OpeningHoursTable.drawTableAndComments(oh, it);