Merge branch 'add/german_sh_2017-2024'

COPYING.LGPL-3.0 → LICENSE

@@ -1,7 +1,7 @@
 Copyright (C) 2012-2013 Dmitry Marakasov
-Copyright (C) 2013-2016 Robin `ypid` Schneider
+Copyright (C) 2013-2017 Robin `ypid` Schneider
 
-(Except where explicitly superseded by other copyright notices)
+(Covers all files except where explicitly superseded by other copyright notices)
 
                    GNU LESSER GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007

Makefile

@@ -138,7 +138,7 @@ qa-source-code:
 	$(REPO_FILES) | egrep --null-data '\.js$$' --null | xargs --null sed -i 's/\([^=!]\)==\([^=]\)/\1===\2/g;s/\([^=!]\)!=\([^=]\)/\1!==\2/g;'
 
 qa-https-everywhere:
-	$(REPO_FILES) | xargs --null sed --regexp-extended --in-place 's#http(:\\?/\\?/)(momentjs\.com|overpass-turbo\.eu|www\.gnu\.org|stackoverflow\.com|openstreetmap\.org|www\.openstreetmap\.org|nominatim\.openstreetmap\.org|taginfo\.openstreetmap\.org|wiki\.openstreetmap\.org|josm.openstreetmap.de|www.openstreetmap.org\\/copyright)#https\1\2#g;'
+	$(REPO_FILES) | xargs --null sed --regexp-extended --in-place 's#http(:\\?/\\?/)(momentjs\.com|overpass-turbo\.eu|www\.gnu\.org|stackoverflow\.com|(:?www\.)?openstreetmap\.(org|de)|nominatim\.openstreetmap\.org|taginfo\.openstreetmap\.org|wiki\.openstreetmap\.org|josm.openstreetmap.de|www.openstreetmap.org\\/copyright)#https\1\2#g;'
 	$(REPO_FILES) | xargs --null sed -i 's#http://overpass-api\.de#https://overpass-api.de#g;'
 	$(REPO_FILES) | xargs --null sed --regexp-extended --in-place 's#http://(\w+\.wikipedia\.org)#https://\1#g;'
 	test -f index.html && git checkout index.html
@@ -201,7 +201,7 @@ check-diff-%.js: %.js test.js
 	else \
 		echo "Test results for $< ($(CHECK_LANG)) produced a different output then the output of the current HEAD. Checkout the following diff."; \
 	fi
-	git --no-pager diff --exit-code -- test.$(CHECK_LANG).log
+	git --no-pager diff --exit-code -- "test.$(CHECK_LANG).log"
 
 .PHONY: osm-tag-data-taginfo-check
 osm-tag-data-taginfo-check: real_test.js opening_hours.js osm-tag-data-get-taginfo

README.md

@@ -505,13 +505,11 @@ Almost everything from opening_hours definition is supported, as well as some ex
 
 *   Support for school holidays (`SH 10:00-14:00`).
 
-    * Germany is supported based on ical files from [schulferien.org].
+    * Germany, see [hc]
     * Also supported:
 
         * Romania
 
-    * To update the school holiday definition or add definitions for other countries the script [convert_ical_to_json][ohlib.convert-ical-to-json] can be used (probably includes a little bit of adjustment of the script) to generate JSON definition based on ical calendar files, which can then be added to the library.
-
 *   There can be two cases which need to be separated (this applies for PH and SH):
 
     1. `Mo-Fr,PH`: The facility is open Mo-Fr and PH. If PH is a Sunday for example the facility is also open. This is the default case.
@@ -813,7 +811,8 @@ Edit: This does also work on npmjs in this short version … -->
 [ohlib.js/i18n-resources.js]: /js/i18n-resources.js
 [ohlib.npmjs]: https://www.npmjs.org/package/opening_hours
 [ohlib.github]: https://github.com/opening-hours/opening_hours.js
-[ohlib.convert-ical-to-json]: /convert_ical_to_json
+
+[hc]: https://gitlab.com/ypid/hc
 
 [moment-lib]: https://momentjs.com/
 

banner.js

@@ -4,7 +4,7 @@
  * @license: LGPL-3.0
  *
  * Copyright (C) 2012-2013 Dmitry Marakasov
- * Copyright (C) 2013-2016 Robin `ypid` Schneider
+ * Copyright (C) 2013-2017 Robin `ypid` Schneider
  *
  * opening_hours.js is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by the