Commit graph

893 commits

Author SHA1 Message Date
7a540ea6ce Translation sync, fix typo 2022-02-27 15:54:50 +01:00
86351f30f4 Hide docking_station bicycle rentals on lower zoom to prevent them flooding the map 2022-02-25 15:38:48 +01:00
5b13d3f25c Merge branch 'develop' 2022-02-22 16:13:59 +01:00
247b2e4db1 Translation sync 2022-02-22 16:13:49 +01:00
793d765ead Add contact information to recycling centers 2022-02-22 16:11:00 +01:00
bc890f5476 Merge branch 'master' into develop 2022-02-22 14:14:01 +01:00
be41ead9bf Translation sync, small fixes 2022-02-22 13:43:36 +01:00
d19791382f Add move and delete options 2022-02-21 11:39:57 +01:00
eddaca7767 Fix typo 2022-02-20 01:46:31 +01:00
9b7a47136c Merge branch 'develop' into waste-theme 2022-02-20 00:47:21 +01:00
Robin van der Linde
2e51a45668 Use icon of waste if only one is set 2022-02-19 22:52:52 +01:00
Robin van der Linde
d49fd8df1f Add white background to icon 2022-02-19 21:40:12 +01:00
Robin van der Linde
cc086eaee1 Allow changing type 2022-02-19 21:37:54 +01:00
798556f6d3 Extract images from watermill.json and trail.json 2022-02-19 17:50:06 +01:00
c06f8820a8 Extract images from slow_roads.json 2022-02-19 17:47:12 +01:00
812626456d Fix dead image 2022-02-19 17:44:25 +01:00
d9d6e96fed Extract images from crossings.json 2022-02-18 23:12:46 +01:00
682b68a094 Regenerate schemas, more fixes to images and licenses 2022-02-18 23:10:27 +01:00
Robin van der Linde
62153e0eb4 Small fixes (organic and appliances) 2022-02-18 11:52:44 +01:00
5ab2e8eabe Extract images for hydrant.json 2022-02-18 04:31:36 +01:00
4ab3d56452 Remove duplicate question, fix english translations 2022-02-18 04:29:41 +01:00
78c60ad549 Fix images in cycleways_and_roads.json 2022-02-18 04:22:09 +01:00
628cffbf0b Extract images from bike_parking.json 2022-02-18 04:12:31 +01:00
8508c86c39 Extract images in barrier.json 2022-02-18 04:10:23 +01:00
32c9f53ff1 Translation sync 2022-02-18 04:06:43 +01:00
cc45fd23b8 Merge branch 'develop' into refactoring/checks-and-icons 2022-02-18 03:55:01 +01:00
1103f8f157 Merge develop 2022-02-18 03:53:15 +01:00
01def612cf Translation sync 2022-02-18 03:27:21 +01:00
ccf059a20b Extract images from tagrenderings 2022-02-18 03:21:54 +01:00
f2d022664a Convert tagrendering-mappings with images to tagrendering-mapping with an icon 2022-02-18 03:16:05 +01:00
0e83d5be79 Merge branch 'waste-theme' of github.com:pietervdvn/MapComplete into waste-theme 2022-02-18 00:06:35 +01:00
8264e8bfc7 Merge develop 2022-02-18 00:05:28 +01:00
2742f03ebf First fixes for charging station theme 2022-02-17 23:58:03 +01:00
f55e5cf26c Fix various issues in themes 2022-02-17 23:56:53 +01:00
Robin van der Linde
e2dc9e1490 Fix translations 2022-02-17 20:31:21 +01:00
Robin van der Linde
879536c823 Changed zoom levels, other details 2022-02-17 14:34:43 +01:00
Robin van der Linde
41009abe5d Change icon 2022-02-17 13:52:16 +01:00
Robin van der Linde
bb30c353b4 Fix typo 2022-02-17 13:47:59 +01:00
Robin van der Linde
010bd7cdc1 Fix filters, add plastic 2022-02-17 11:03:11 +01:00
Robin van der Linde
aabd6636c7 Merge branch 'develop' into waste-theme 2022-02-17 08:50:55 +01:00
b9ff8667a9 Fix last untranslated strings, make these errors again 2022-02-16 22:18:58 +01:00
07823087e1 More missing translations 2022-02-16 21:25:18 +01:00
61afce4197 More translation validations 2022-02-16 03:22:16 +01:00
bf05a88afd Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-02-16 02:31:39 +01:00
92f5b57c9f Add validation rule: public themes should have a complete translation in english 2022-02-16 02:23:50 +01:00
e721146ca1 Show loading screen when logging in 2022-02-15 15:42:09 +01:00
2ea363f6e0 Add bicycle rental presets 2022-02-14 19:00:25 +01:00
419f2b1351 Fix personal theme, add possibility to sync layer selection 2022-02-14 18:18:05 +01:00
4f45fed45a Fix webmanifest images 2022-02-14 16:12:38 +01:00
84b14cd7e4 Translation sync 2022-02-14 16:02:08 +01:00
66d2d167a2 Merge branch 'master' into develop 2022-02-13 20:59:10 +01:00
d193c34f05 Fix translations 2022-02-13 20:58:21 +01:00
8876d8748e Merge and sync translations 2022-02-13 20:54:31 +01:00
b2741e1b6d Fix tests 2022-02-11 19:56:31 +01:00
5bfcfa8536 Tweaks to cyclofix, add circle for 'pin je punt' 2022-02-11 19:21:53 +01:00
44603536fc Add question on bike repair station access 2022-02-11 02:05:33 +01:00
6ff4d22de3 Add question on accessibility of bicycle pumps 2022-02-11 02:03:33 +01:00
fa2e9db571 Merge branch 'develop' 2022-02-11 01:29:50 +01:00
3d2b55f9f1 Various styling and language tweaks 2022-02-11 01:20:01 +01:00
b920753544 s/picnictafel/picknicktafel/ 2022-02-11 00:27:45 +01:00
db770f2c35 Fix the last fake images, fix non-square theme icons, throw an error on fake svgs and non-square icons (if public theme) 2022-02-10 23:10:39 +01:00
b3c58ae82e Extract and validate images using a new conversion, regenerate docs 2022-02-09 22:37:21 +01:00
65dbcd774b Fix tests 2022-02-09 03:46:50 +01:00
186b8a79ac Add example images to presets, fix these in bike_repair_station, add more repair_stand examples, fix fake svgs, wording updates 2022-02-09 03:38:40 +01:00
58cd866e54 Rephrasing of charging station items 2022-02-09 02:24:37 +01:00
c18c8196a3 Remove png-parts from svg 2022-02-09 02:21:33 +01:00
729b5ce828 Small rewordings 2022-02-09 02:01:02 +01:00
b0dc38fcb0 Formatting 2022-02-09 01:59:39 +01:00
4642e34da7 Fix some feedback on Toerisme Vlaanderen theme about playgrounds-theme 2022-02-09 00:47:41 +01:00
1fed27abde Small fixes to preset texts 2022-02-09 00:34:01 +01:00
688dcae3b0 Various theme, icon and language fixes 2022-02-08 18:29:21 +01:00
b96c4f41fa Furhter cleanup of fake svgs 2022-02-08 02:24:37 +01:00
83acec30d4 Use labels to hide some questions in toerisme_vlaanderen theme 2022-02-08 02:24:24 +01:00
73984ad462 Convert SVGs with embedded png into proper SVG 2022-02-07 01:55:47 +01:00
dd63ed7ab0 Add detection for svgs which actually contain pngs, convert png into proper svg 2022-02-06 03:02:45 +01:00
278fce8726 Fix #640: generate an icon with a white background automatically 2022-02-06 01:57:33 +01:00
3e2c6a0f23 Improvements to themes 2022-02-04 02:48:31 +01:00
516c3a10d7 Translation sync 2022-02-04 01:30:39 +01:00
84a6170e3e Remove unneeded translations 2022-02-04 01:24:47 +01:00
e6cb3bc22a Tweaks to the observation_tower theme 2022-02-04 01:21:45 +01:00
7eeffc2305 Refactoring of conversion 2022-02-04 01:05:35 +01:00
62b646da99 Add icons of toerisme_vlaanderen styling; make maxspeed=30 and motor_vehicle:overtaking=no a belgian-only preset for cyclestreets, fix various consistency bugs and styling tweaks 2022-02-04 00:40:30 +01:00
aaaf0b8c36 More styling tweaks and bug fixes 2022-02-01 19:02:46 +01:00
f3f7fde29d Fix build 2022-02-01 13:16:38 +01:00
c15f3d2036 Lots of styling tweaks, add filter links between layers 2022-02-01 04:14:54 +01:00
d1e99fc2d3 Cyclestreets: only add maxspeed=30 in Belgium; change 'language' to 'locale' in changeset tags, load notes in import_viewer up to two years back, language tweaks 2022-01-31 20:52:56 +01:00
a11e0fc545 Merge master 2022-01-31 20:12:11 +01:00
5a9f26081c Natuurpunt tweaks 2022-01-31 14:34:06 +01:00
74489d5e3f Merge master 2022-01-30 19:06:41 +01:00
a4fc9ef67e Small fixes to bicycle cleaning layer 2022-01-30 18:34:03 +01:00
9594868e83 Better tag rewriting, add icons, add bicycle rental theme 2022-01-29 02:45:59 +01:00
275f7380ed Translation sync 2022-01-27 01:33:28 +01:00
99edba4c73 Merge master 2022-01-26 21:12:25 +01:00
791c6c4f55 Include route=foot in trails 2022-01-25 18:20:15 +01:00
e404e48f29 Add 'hide import notes'-filter 2022-01-24 03:09:50 +01:00
913dc07eea Merge branch 'master' into develop 2022-01-21 14:58:35 +01:00
df168413d0 Translation sync 2022-01-21 14:55:05 +01:00
b10d947072 Merge branch 'master' into waste-theme 2022-01-21 02:34:27 +01:00
f70fcfe75f Merge branch 'master' into develop 2022-01-21 02:29:49 +01:00
af2c617423 Translation sync 2022-01-21 02:29:44 +01:00
ca1490902c Finish importer, add applicable import layers to every theme by default 2022-01-21 01:57:16 +01:00
3402ac0954 Lots of refactoring, first version of the import helper 2022-01-19 20:34:04 +01:00
5c71bfa294 Attempt to fix social image previews 2022-01-18 20:18:12 +01:00
25f956c808 Autoreformat all the things 2022-01-18 18:52:42 +01:00
d4d7ab6f3a More fixing, first complete version of UK-addresses-theme 2022-01-17 23:50:50 +01:00
2001aae10d Merge branch 'master' into develop 2022-01-15 02:47:08 +01:00
eba52836b2 Cosmetic changes to toerisme_vlaanderen theme 2022-01-14 15:46:45 +01:00
6ae8ec8036 Add 'add new note' functionality, fix bug where 'test'-theme comes up when deleting images 2022-01-14 01:41:19 +01:00
6999a73d44 Add import from notes functionality 2022-01-12 02:31:51 +01:00
2697feebe0 Merge branch 'master' into develop 2022-01-11 11:45:27 +01:00
cc1c0960b0 Fix translations 2022-01-11 11:42:53 +01:00
722493cf9c Merge branches 2022-01-11 11:32:46 +01:00
d2b8a78ab8 Translation sync 2022-01-11 11:32:10 +01:00
d92dec6a0f Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2022-01-11 11:28:03 +01:00
Robin van der Linde
8e624b4122 Fix build and add unmarked crossing (#609) 2022-01-11 10:29:14 +01:00
riQQ
59c25f8b0e
Use approved tag cycle_barrier in the barrier layer
This replaces all references to the niche tag cycle_barrier:type with the approved tag cycle_barrier in the barrier layer.

Fix #610
2022-01-11 00:37:18 +01:00
e0b58a0f55 Import work 2022-01-10 19:10:13 +01:00
Robin van der Linde
b5bfd6558b Add waste_assen, add location for disposal 2022-01-09 17:39:51 +01:00
Robin van der Linde
b59f3ca5c8 Added waste to recycling theme 2022-01-09 14:28:14 +01:00
42a6b37ca6 Add filters 2022-01-08 22:11:24 +01:00
951877dc50 Merge branch 'master' into waste-theme 2022-01-08 20:08:57 +01:00
965faca0e5 MapComplete now always zooms up to level 21 with overzoom, fix #606 2022-01-08 20:05:00 +01:00
c998cc5c7f Resize all SVG images 2022-01-06 20:54:00 +01:00
d4f5e1d238 Add script to automatically rescale SVG images - important to export them to PNGs 2022-01-06 20:39:59 +01:00
7090a5ceb8 Performance hacks 2022-01-06 18:51:52 +01:00
0f91a3188c Merge branch 'develop' into waste-theme 2022-01-06 15:39:29 +01:00
64dd0d66ae Merge branch 'master' into develop 2022-01-06 15:38:44 +01:00
e2b3910afe Translation sync 2022-01-06 15:38:43 +01:00
7f7d6f5fe1 Translation sync 2022-01-06 15:37:57 +01:00
3176a4d665 More or less working version of advanced conflation 2022-01-06 14:39:42 +01:00
8485773a1d More work on conflation logic 2022-01-05 16:36:08 +01:00
Robin van der Linde
abb1e39612 Added names and iconBadges 2022-01-02 20:54:00 +01:00
Robin van der Linde
1acf72cc70 Fix typo 2022-01-01 16:01:33 +01:00
Robin van der Linde
fe539d72f9 Add waste disposal layer 2022-01-01 15:32:33 +01:00
Robin van der Linde
8b0c07f898 Fix filter 2022-01-01 14:00:24 +01:00
Robin van der Linde
775f52839a Added filters to waste_basket layer 2022-01-01 03:09:08 +01:00
Robin van der Linde
5a6e566fe2 Added recycling types 2022-01-01 02:56:06 +01:00
a35b1d34f4 Fix #595: cycle_barrier preset correction, add option to switch 2022-01-01 02:03:00 +01:00
Robin van der Linde
67319fc8d9 Test with waste theme (Happy New Year🎇🎉) 2022-01-01 00:03:08 +01:00
5e03a06bf7 Expose geometry type as metatag 2021-12-30 22:01:23 +01:00
62c34451fd
Fix reviews 2021-12-29 20:46:57 +01:00
5b0fcc7e27
Food.json: add reviews 2021-12-29 20:44:20 +01:00
57096028c6
Add partial fill to etymolgy 2021-12-28 20:50:35 +01:00
7f829a3578 Add export_as_geojson, open_in_id and open_in_josm special renderings 2021-12-23 21:28:41 +01:00
adade2e8b0 Add unused node removal 2021-12-23 03:36:03 +01:00
9e40e459e5 Cleanup of svg files, move matchpoint to explicit layer 2021-12-22 01:08:11 +01:00
7e46e25943 Translation sync 2021-12-13 20:59:38 +01:00
e0019de9e2 Merge master 2021-12-13 20:55:51 +01:00
9d498ec824 Translation fix and sync 2021-12-13 20:55:11 +01:00
8f81f6aebb Remove dependency on pietervdvn.github.io in favour of mapcomplete-data repository 2021-12-12 03:10:56 +01:00
c8b0d8f914 Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2021-12-12 03:01:50 +01:00
20ec12b23c Add special visualisation for automated actions, add missing_street-theme, various fixes 2021-12-12 02:59:24 +01:00
43c052bf91
Add allowMove 2021-12-11 16:17:33 +01:00
a9d9aefa2c
Merge pull request #585 from riQQ/patch-1
Fix typo in charging station theme readme
2021-12-11 02:22:34 +01:00
65b1891cb6 Add metacalculation on currentview 2021-12-11 02:19:28 +01:00
riQQ
53c094cb45
Fix typo in charging station theme readme 2021-12-11 00:22:45 +01:00
c76b0a6340 Add current view popup 2021-12-10 17:30:50 +01:00
021c0a8e34 Rerun script 2021-12-10 15:55:48 +01:00
3958290824 Fix csvToJson 2021-12-10 15:51:32 +01:00
dc5b777713 First attempt for a current-view box 2021-12-10 15:51:08 +01:00
ee3a18def1 First attempt for a current-view box 2021-12-10 15:50:59 +01:00
4b07959b22 Translation sync 2021-12-10 15:32:11 +01:00
1b5d8c56bd Merge branch 'master' into develop 2021-12-10 14:41:07 +01:00
dac4b1bd15 Fix #578 2021-12-10 14:29:12 +01:00
1abf38e32b Add missing ) 2021-12-10 14:16:43 +01:00
366a16e036 Fix typo, fix #580 2021-12-10 13:24:03 +01:00
a095af4f18 Refactoring of import button, various improvements 2021-12-10 04:00:02 +01:00
cabbdf96db Merge branch 'develop' into refactor/import-button 2021-12-09 21:13:22 +01:00
52163d60c0 Switch crab and latlon2country to new data storage github 2021-12-09 21:12:01 +01:00
6e84dfcab0 Refactoring the import button 2021-12-09 13:16:40 +01:00
f29c62ab19 Add pedestrian paths to entrance-layer, fix rendering in location-input element, fallback to OSM if map layer is not available 2021-12-09 01:22:57 +01:00
b28243829b Formatting 2021-12-07 18:35:14 +01:00
fc2ede2259 Actually hide gps-track, add better documentation output 2021-12-07 18:18:24 +01:00
18044ff22b Hide gps track by default 2021-12-07 11:02:15 +01:00
9cfb7fbe68 Update of latlon2country and use its async interface; small refactoring of simplemetagging, improvements to cacheBuilder which respects isShown and calculated tags now 2021-12-07 02:22:56 +01:00
89004af7f9 Further work on GRB, bugfixes 2021-12-06 03:24:33 +01:00
3cada0b678 Layer reformatting/translation generation 2021-12-05 21:02:55 +01:00
7757e898ba Fix build 2021-12-05 05:28:43 +01:00
f949a52d92 Add descriptions to builtin layers 2021-12-05 05:16:24 +01:00
6ee546010c Improvements to the CRAB-theme and adresses 2021-12-05 05:16:04 +01:00
0ee23ce36d Further improvements to entrances theme, add layer-crossdependency detection, add layers which another layer depends on automatically to the theme, add documentation on which layers depends on which other layers, regenerate documentation 2021-12-05 02:06:14 +01:00
8e40d76281 Add assets for entrances, add first dependency injection 2021-12-04 21:51:53 +01:00
96adaa4b0e First draft of entrance layer 2021-12-04 21:49:37 +01:00
925860ad63 Regen translations 2021-12-03 02:31:01 +01:00
51459d6fe2 Regenerate documentation 2021-12-03 02:30:25 +01:00
5f3c8dd1b4 Add walls_and_buildings layer 2021-12-03 02:27:28 +01:00
a3185f2d13 Move SPlit-points to seperate layer; fix rendering bug on minimaps 2021-12-03 01:29:09 +01:00
d593540e3a Small tweaks to toilet theme 2021-12-02 23:06:03 +01:00
a9eddc3e81 Translation sync 2021-12-02 23:02:37 +01:00
7cfbb49bab cd 2021-12-02 02:54:28 +01:00
9a20451e81 Merge branch 'develop' into feature/professional 2021-11-30 20:26:54 +01:00
3f37848022 Remove preset, fix and sync translations 2021-11-30 15:53:28 +01:00
ac14ef9620 Fix typo, remove confusing presets 2021-11-30 15:48:19 +01:00
f7e411527f Split hailhydrant into layers 2021-11-28 14:52:44 +01:00
d9a323d477 Translation sync 2021-11-28 14:45:52 +01:00
bd102354ff Fix build 2021-11-26 20:01:06 +01:00
d30aea5747 Translation reset 2021-11-25 17:59:12 +01:00
77b2ced59c Fix email messages 2021-11-24 19:59:26 +01:00
4366366586 Center label if no icon is present, add login button to index page 2021-11-22 00:50:29 +01:00
37c0129a6d Add buttons to quickly swap background layers (also in the locationInput), move copyright into home panel, split privacy policy to seperate welcome message tab 2021-11-21 02:44:35 +01:00
0372f99d84 Merge master 2021-11-18 23:11:47 +01:00
03129a33a2 Translation sync 2021-11-16 19:04:49 +01:00
57fc5dc5d1 Hide operator if network is known, add a bit of wikidata, fix #389, fix #559 2021-11-16 19:04:04 +01:00
3e7f1da8e7 Merge branch 'master' into develop 2021-11-16 15:50:32 +01:00
06098feaf7 Fix multilinestring rendering 2021-11-16 15:50:26 +01:00
f486a64150 Add brand to public bookcase 2021-11-16 15:33:55 +01:00
fa82faade7 Translations regen 2021-11-16 04:16:44 +01:00
f81c0531a1 Merge master 2021-11-16 03:22:16 +01:00
134be7177e Use 4 spaces in translation files for compatibility with hosted weblate 2021-11-16 02:59:33 +01:00
b883cd87d0 Do not zoom to GPS location if an element is selected 2021-11-15 16:57:04 +01:00
eae05b21c6 Fix etymology theme 2021-11-15 14:31:21 +01:00
29b961d7e8
Add level and description to toilet theme 2021-11-13 16:21:13 +01:00
680e56397d GeoOperations.distanceBetween now uses meters, fix GPS tracking 2021-11-12 18:39:38 +01:00
a37a7462a2 Better handling of GPX-state 2021-11-12 04:11:53 +01:00
519feaa54b Add the possibility to show all questions of a group as one + documentation update 2021-11-12 01:44:13 +01:00
0018fcf1f0 Only do ID-check on tagrenderings for official themes 2021-11-11 17:14:03 +01:00
746273f594 Another sanity check, another bunch of fixed layers; add tagrendering-steal possibility, add some styling to TV-theme 2021-11-10 18:42:31 +01:00
ac751ed7bc Fix translations for charging stations; re-add technical questions 2021-11-10 08:51:24 +01:00
1dbe167e4e POlygon rendering fixes 2021-11-09 19:45:26 +01:00
1af5e44ad4 Various small fixes 2021-11-09 18:41:20 +01:00
c1220da879 Fix way rendering in themes 2021-11-09 18:22:26 +01:00
e8ce53d5eb Add 'export as GPX'-feature, fix #276 2021-11-08 20:49:51 +01:00
ec09a72cae Merge master 2021-11-08 17:48:10 +01:00
83b75735ce Fixes to the layers 2021-11-08 15:31:25 +01:00
161bcc8647 Quickfix: add centroids to some renderings which dissappeared during migration 2021-11-08 15:08:24 +01:00
d3d51af667 Add gps track line, add documentation 2021-11-08 14:18:45 +01:00
7b7076168f Merge master 2021-11-08 03:19:31 +01:00
aa9b41724f Fix typo 2021-11-08 03:15:31 +01:00
42b40f49d7 Remove duplicate item 2021-11-08 03:13:07 +01:00
fef6d7c1a5 Merge branch 'master' into develop 2021-11-08 03:11:10 +01:00
3b6c1c16a5 Fix translations 2021-11-08 03:11:06 +01:00
1de50237a0 Merge branch 'master' into develop 2021-11-08 03:06:39 +01:00
49ee00e10a Fix typo 2021-11-08 03:06:33 +01:00
36faf6f7f1 Readd questions in toilet which dissappeared 2021-11-08 03:05:37 +01:00
3334e0d384 Stricter layer checking 2021-11-08 03:00:58 +01:00
2ee429be1b Merge branch 'master' into develop 2021-11-08 02:39:12 +01:00
fda9eaead4 Fix build 2021-11-08 02:39:02 +01:00
09eee08fbc Documentation updates 2021-11-08 02:36:01 +01:00
78c689b7e8 Merge branch 'master' into develop 2021-11-08 00:46:07 +01:00
b928bcda6f Remove obsolete keys through lint script (once more) 2021-11-07 21:20:05 +01:00
c7386007bc Add service:electricity to pubs and food-amenities 2021-11-07 21:17:55 +01:00
0e30bd58d8 Fix translations 2021-11-07 19:47:52 +01:00
fdb769a0fc Fix text-area type, support for newlines in key substitutions (fix #543), small tweaks to etymology-theme (fix #537) 2021-11-07 18:37:42 +01:00
7839712deb Merge branch 'master' into develop 2021-11-07 18:08:02 +01:00
b609885a1f Fix bike parking location question 2021-11-07 18:06:57 +01:00
459d25d24c Various fixes on toilets-layer: add opening hours and payment options, fix typos 2021-11-07 18:03:21 +01:00
bb283b59a4 Fix build 2021-11-07 16:43:29 +01:00
bd21212eba Full code cleanup 2021-11-07 16:34:51 +01:00
70964f645a Merge branch 'develop' of github.com:pietervdvn/MapComplete into develop 2021-11-07 15:44:47 +01:00
e237d84436 Merge master, fix translations 2021-11-07 15:44:22 +01:00