Commit Graph

1531 Commits

Author SHA1 Message Date
Maxime Gimeno 0bda2dd231 remove c++11 2019-09-17 09:39:46 +02:00
Laurent Rineau 502945633c Rename Data to Point, because it must be the type of Vertex::point() 2019-09-10 12:42:03 +02:00
Laurent Rineau b1df25dcf6 Remove the useless point_ data member 2019-09-09 15:49:33 +02:00
Mael Rouxel-Labbé 197a29436c Test new tag 2019-08-22 12:45:19 +02:00
Mael Rouxel-Labbé e955c38215 Add a new tag allowing constraints to intersect if no construction is required 2019-08-22 12:44:16 +02:00
Mael Rouxel-Labbé 970b0cfeaa Add few more tests 2019-08-19 18:02:06 +02:00
Mael Rouxel-Labbé 013272a466 Fix not throwing on T-like segment intersection (extremity on interior) 2019-08-19 17:55:39 +02:00
Mael Rouxel-Labbé 59e0e87e24 Readability (no real changes) 2019-08-19 17:55:26 +02:00
Mael Rouxel-Labbé 5ef8c966ea Add some tests for CDT throwing on intersections 2019-08-19 17:55:06 +02:00
Mael Rouxel-Labbé f3ccb18da0 Fix typo 2019-08-19 17:18:55 +02:00
Mael Rouxel-Labbé 869baed46f Fix not throwing on overlapping constraints 2019-08-19 17:18:29 +02:00
Laurent Rineau 830bb9640f Merge pull request #4141 from albert-github/feature/bug_obsolete_images
warning: image file name tds_small.png is ambiguous.
2019-08-16 13:24:58 +02:00
Laurent Rineau fcf6ea4d5c Merge branch 'releases/CGAL-4.14-branch' 2019-08-16 13:24:32 +02:00
Laurent Rineau f70640a675 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-08-16 13:24:11 +02:00
Andreas Fabri 8802f9877b Triangulation_2: Fix documentation of a typedef 2019-08-13 02:11:35 -07:00
Sebastien Loriot 472e4ab4f9
Merge pull request #4138 from albert-github/feature/bug_unbalanced
warning: unbalanced grouping commands
2019-08-12 09:15:43 +02:00
albert-github 62f2fef741 warning: image file name tds_small.png is ambiguous.
Some images were present on multiple places but the second reference was not used anymore.
2019-08-08 13:41:18 +02:00
albert-github 1a38e5295d warning: unbalanced grouping commands
Removing last "warning: unbalanced grouping commands" messages.

Note: maybe useful to add in Triangulation_2/doc/Triangulation_2/CGAL/Triangulation_2.h some `\name` parts for handles / iterators / ...
2019-08-05 16:00:53 +02:00
Sébastien Loriot b84297f8f6 update the usage for the new CGAL named function parameters 2019-07-29 09:38:39 +02:00
Sébastien Loriot 25a05e9f4c Merge branch 'CGAL-named_function_parameters-4.14' into master
Conflicts resolved by hand
2019-07-28 23:46:43 +02:00
Sébastien Loriot 2f81a21523 Merge 'CGAL-named_function_parameters' for 4.13-branch into 4.14-branch
Conflicts resolved by hand
2019-07-28 22:30:13 +02:00
Sébastien Loriot 1f8065c6c3 Merge pull request #3885 from MaelRL/PMP-Locate-GF
PMP: Add locate.h and rewrite Triangulation_2 graph traits
2019-07-18 16:40:49 +02:00
Sebastien Loriot 667e4022f7
Merge pull request #4060 from sloriot/CGAL-doc_match_brackets
match @{ and @}
2019-07-18 16:26:43 +02:00
Sébastien Loriot 560c77f567 rename named function parameter class 2019-07-15 06:25:02 +02:00
Laurent Rineau dc02598a5c Merge pull request #4016 from gdamiand/CGAL-more_viewers-gdamiand
CGAL: more viewers
2019-07-10 14:22:50 +02:00
Sébastien Loriot fbafb9d06f fix remaining mismatches and fix bugs 2019-07-10 11:40:45 +02:00
Sébastien Loriot 983645a51a match @{ and @} 2019-07-05 21:49:46 +02:00
Laurent Rineau c0ba28f80a Merge branch 'releases/CGAL-4.14-branch' 2019-07-03 11:18:20 +02:00
Laurent Rineau e79bfd5d03 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-07-03 11:10:03 +02:00
Mael Rouxel-Labbé f68141a6d3 Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-07-01 11:28:25 +02:00
Laurent Rineau 32f80cbece Merge pull request #4018 from lrineau/CGAL-refresh_cmake_minimum_required-GF
CMake>=3.13: opt for for new policies up to 3.15
2019-07-01 11:16:30 +02:00
Laurent Rineau dbb1cb6c9b Merge pull request #3974 from afabri/Triangulation-add_ranges-GF
Triangulation_{2,3):  Add ranges
2019-07-01 11:16:05 +02:00
Andreas Fabri a9bd8226bc Do not use C++11 2019-06-26 15:35:11 +02:00
Andreas Fabri 060ec7c5c2 No auto 2019-06-26 14:47:35 +02:00
Andreas Fabri aeac816801 Triangulation_2: Fix remove_vertex_from_constraint-GF 2019-06-26 14:34:41 +02:00
Andreas Fabri c1f337d585 Triangulation_2: Fix CDT_plus_2::remove_constraint() 2019-06-20 12:17:15 +02:00
Guillaume Damiand 67307dcead Merge master to remove conflicts; plus rephrase draw documentation following Sebastien comments. 2019-06-19 15:48:10 +02:00
Laurent Rineau 4fbf00fb8a CMake>=3.13: opt for for new policies up to 3.15 2019-06-19 14:34:59 +02:00
Guillaume Damiand 8a3cb666fd Correct links to CGAL::draw functions. 2019-06-19 13:10:08 +02:00
Mael Rouxel-Labbé 7f6cb0411c Merge branch 'PMP-Locate-GF-old' into PMP-Locate-GF 2019-06-18 08:20:16 +02:00
Mael Rouxel-Labbé d75821f27a Rename template parameter to help MSVC
Seems like MSVC gets confused between 'Tr' being both a template paramter
and a typedef in the class being passed as template parameter.
2019-06-17 08:33:23 +02:00
Andreas Fabri 1e1bfa1675 constness 2019-06-15 22:30:47 +02:00
Andreas Fabri e15dbd02aa Use const& 2019-06-14 15:47:43 +02:00
Mael Rouxel-Labbé a189e82686 Cache a descriptor within the iterators so operator*() can return a reference 2019-06-14 10:47:20 +02:00
Mael Rouxel-Labbé 0ea40f7602 Add missing 'const' in conversion operator 2019-06-14 10:46:46 +02:00
Andreas Fabri 7a49b48019 Add code and test for all_edges() 2019-06-12 09:23:57 +02:00
Andreas Fabri cc76597a3e Fix in the testcase. Forgot to test if the range is empty, before dereferencing the iterator 2019-06-11 12:02:27 +02:00
Andreas Fabri c34536be24
Apply suggestions from code review
Co-Authored-By: Mael <mael.rouxel.labbe@geometryfactory.com>
2019-06-05 17:26:37 +02:00
Andreas Fabri f7b7b9957f Merge remote-tracking branch 'cgal/master' into CGAL-null_ptr-GF 2019-06-05 14:47:11 +02:00
Laurent Rineau 39c8f7ae1f Merge pull request #3950 from afabri/Triangulation_23-PointWithInfo-GF
2D and 3D Triangulations:  Unify insertion of range of points with info
2019-06-05 11:20:23 +02:00
Andreas Fabri 2a044cff99 Fix and polish doc 2019-06-05 11:05:50 +02:00
Andreas Fabri 7111518cb0 Fix usage of Vertices_in_constraint 2019-06-05 08:02:19 +02:00
Andreas Fabri 5532b84b4f nullptr_t -> std::nullptr_t 2019-06-05 07:28:56 +02:00
Andreas Fabri e2d19b0c8d Replace NULL and Nullptr_t with nullptr and nullptr_t 2019-06-04 23:45:44 +02:00
Andreas Fabri 9db0366789 whitespace 2019-06-04 17:25:25 +02:00
Andreas Fabri 22a8edd750 doc 2019-06-04 16:52:33 +02:00
Andreas Fabri 70720e224f Add documentation for T2 2019-06-04 16:32:30 +02:00
Andreas Fabri 785ae04e0b Add ranges to Regular_triangulation_2 2019-06-04 12:45:42 +02:00
Andreas Fabri 0ed700b30c Unify wording 2019-05-25 10:13:56 +02:00
Andreas Fabri f954b00063 Fix error 2019-05-24 11:32:32 +02:00
Andreas Fabri 7b4bad5666 Fix warnings 2019-05-24 11:14:58 +02:00
Laurent Rineau 419032d859 Merge pull request #3947 from MaelRL/CGAL-Fix_typos-GF
Fix some typos in code/comments/documentation
2019-05-23 08:50:14 +02:00
Laurent Rineau b8fe6b10ee Merge pull request #3804 from afabri/CGAL_tests_must_not_include_basic-GF
Do not include <CGAL/basic.h>
2019-05-21 16:37:01 +02:00
Laurent Rineau 3a9b2fe67f Merge branch 'releases/CGAL-4.14-branch' 2019-05-21 16:36:28 +02:00
Laurent Rineau e4c82fa260 Merge branch 'releases/CGAL-4.13-branch' into releases/CGAL-4.14-branch 2019-05-21 16:35:24 +02:00
Andreas Fabri f354210be3 Add using statements 2019-05-21 14:32:03 +02:00
Andreas Fabri 2d1c78fdd9 Unify T3 2019-05-20 18:23:08 +02:00
Andreas Fabri 12ffb4a844 fix typo in doc 2019-05-20 17:32:55 +02:00
Andreas Fabri 85d9ec1ae1 Unify 2D 2019-05-20 17:30:31 +02:00
Mael Rouxel-Labbé 2848158354 Fix typos 2019-05-20 08:54:04 +02:00
Sébastien Loriot e6d0080cc7 fix the init of the vertex index vector 2019-05-14 09:15:44 +02:00
Mael 0efaed2095
Merge branch 'master' into PMP-Locate-GF 2019-05-06 15:57:09 +02:00
Andreas Fabri 2287817654 Add using compare_y 2019-05-02 13:49:33 +02:00
Andreas Fabri a3d535c553 Fix compilation, Add documentation, Add test for IO 2019-05-02 10:41:12 +02:00
Andreas Fabri abdad1585b Add this-> when calling a function inherited from a temmplate parameter 2019-04-30 17:53:32 +02:00
Andreas Fabri e0c2222c1f Constrained_triangulation_plus_2: Fix I/O 2019-04-30 13:24:52 +02:00
Andreas Fabri 26b26ea506 Remove deprecated function 2019-04-30 12:21:06 +02:00
Andreas Fabri 4724e3a358 Remove deprecated function 2019-04-30 12:21:03 +02:00
Mael Rouxel-Labbé 9abef28840 Add missing operator< for T2 edge descriptors
and removed useless comparators
2019-04-29 16:05:51 +02:00
Mael Rouxel-Labbé ab092afe57 Include 2D triangulation BGL properties from BGL graph traits header
for convenience
2019-04-29 15:45:22 +02:00
Mael Rouxel-Labbé a03701d2b7 Fix key type in generic 2D triangulation BGL properties 2019-04-29 15:44:51 +02:00
Mael Rouxel-Labbé 9cba48acfe Fixed TDS graph traits implementation and factorized some parts with other T2 GT 2019-04-29 13:22:45 +02:00
Mael Rouxel-Labbé 64d7747f8b Moved factorized 2D graph traits to /internal 2019-04-29 13:21:46 +02:00
Mael Rouxel-Labbé 9a03b19bfa Fixed TDS2 graph traits to work without relying on halfedge hacks from TDS2.h 2019-04-29 12:21:42 +02:00
Mael Rouxel-Labbé 842ae3fbbd Change T2 graph traits to only use finite elements
This is way more logical because infinite faces have corrupt geometry,
and do not present any particular use (if you want the convex hull, just
walk the border)

This is a breaking change, but the whole traits was so broken nobody could
have been using it in the first place anyway.
2019-04-29 08:29:40 +02:00
Mael Rouxel-Labbé aa4e1913d1 Partial revert of 42a1c49066
Halfedges in TDS2 and T2 were being used to get halfedges in the T2 graph traits
We now do it differently and without polluting the packages T2 and TDS2
2019-04-29 08:29:40 +02:00
Mael Rouxel-Labbé 9f57d48642 Factorize T2 graphs' properties via macros 2019-04-24 13:14:09 +02:00
Mael Rouxel-Labbé d9a0baa442 Multiple fixes for T2 graph traits factorization
(need independent iterator classes, make it work for RT2 despite RT2 having
a different vertex iterator, etc.)
2019-04-24 13:12:48 +02:00
Mael Rouxel-Labbé da59fabb72 Fixed TH_2 not informing the user that you can't just use any vertex 2019-04-24 13:10:32 +02:00
Mael Rouxel-Labbé 092286a8b8 Fixed grabbing non-existent 'Point' typedef from a face base class 2019-04-23 11:44:19 +02:00
Sébastien Loriot 564a6c72f4 Merge remote-tracking branch 'cgal/releases/CGAL-4.14-branch' 2019-04-23 10:46:32 +02:00
Sébastien Loriot 0651c97fdd Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-04-23 10:45:27 +02:00
Mael Rouxel-Labbé 62cb1b7283 Added class Triangulation_face_base_with_id_2 2019-04-23 10:32:59 +02:00
Mael Rouxel-Labbé 811810c02c Switch the three main triangulations' graph traits to a common version 2019-04-19 17:17:09 +02:00
Mael Rouxel-Labbé 09df9b5622 Added some common graph traits for all 2D triangulations 2019-04-19 17:14:52 +02:00
Mael Rouxel-Labbé 28a210837e Fixed missing vertex point pmap (+ property) in RT2 graph traits 2019-04-19 08:39:52 +02:00
Sebastien Loriot 7b01c13f8d
Merge pull request #2938 from afabri/Triangulation_2-internal-GF
Triangulation_2: Cleanup of include/CGAL
2019-04-18 15:51:15 +02:00
Sebastien Loriot 14ebc2fabc
Update Triangulation_2/include/CGAL/Polyline_constraint_hierarchy_2.h
Co-Authored-By: afabri <andreas.fabri@geometryfactory.com>
2019-04-18 13:54:46 +02:00
Andreas Fabri f1c6990a57 Add a test for a reported issue 2019-04-18 13:52:34 +02:00
Andreas Fabri d3128e75e5 We need two versions of the insert_constraint() function,
- one for the old API where constraints were just a 2d segment
- and one for polylines
2019-04-18 13:52:34 +02:00
Sébastien Loriot c8a3fdaff6 Merge pull request #3625 from sgiraudot/Stream_support-Enhance_color-GF
[Small Feature] Reworked CGAL::Color
2019-04-12 15:54:30 +02:00
Sebastien Loriot 80cece608c
Merge pull request #3595 from MaelRL/T2-Remove_strict_conflict_zone_boolean-GF
Triangulation_2: revert small feature DT2_strict_and_weak_conflict_zone
2019-04-12 15:35:06 +02:00
Andreas Fabri 899364b87b Remove files that were deprecated in 4.9 2019-04-12 14:57:18 +02:00
Andreas Fabri 100d4f34ef Merge branch 'Triangulation_2-internal-GF-old' into Triangulation_2-internal-GF 2019-04-09 15:20:59 +02:00
Simon Giraudot d314711eaf Merge remote-tracking branch 'mine/Stream_support-Enhance_color-GF' into Stream_support-Enhance_color-GF 2019-04-09 15:00:56 +02:00
Simon Giraudot 2c1ca1e893 Replace old color API using global const variable with new one using functions 2019-04-03 11:51:29 +02:00
Sébastien Loriot ce126b87c6 remove cpp11::copy_n, cpp11::prev, and cpp11::next and use std instead 2019-03-29 13:28:32 +01:00
Laurent Rineau fc81d3bfec Merge pull request #3780 from afabri/CGAL-links-GF
Some Documentation Fixes for Issue #3457
2019-03-27 18:05:17 +01:00
Andreas Fabri a1609350aa Remove #include<CGAL/basic.h> amd put what is needed if something is missing 2019-03-27 15:21:33 +01:00
Laurent Rineau 1014687627
Merge pull request #3775 from MaelRL/Doc_fixes-GF
Doc fixes
2019-03-25 12:24:49 +01:00
Andreas Fabri 5fdcfc989f Merge branch 'master' into Triangulation_2-internal-GF 2019-03-22 11:55:22 +01:00
Andreas Fabri a472c24185 http:/www.boost.org -> https://www.bost.org 2019-03-20 08:59:22 +01:00
Laurent Rineau 60478dd816 Merge pull request #3758 from albert-github/feature/bug_advanced_2
Correction of (X)HTML warnings in case of Advanced topics
2019-03-19 18:30:53 +01:00
Mael Rouxel-Labbé 61b0be45eb Fix some bad links 2019-03-15 21:14:17 +01:00
albert-github 28fdb2d425 Correction of (X)HTML warnings in case of Advanced topics
Based on suggestion of @sloriot using `^^` also in cgalAdvancedEnd instead of adding a new line in the files
2019-03-15 11:33:48 +01:00
Maxime Gimeno d9f9c58342 Merge pull request #3729 from afabri/T2-typos-GF
T2,T3,Mesh_2: backticks, lowercase, capitalize
2019-03-12 17:04:17 +01:00
albert-github 8b7f0bcb1e Correction of (X)HTML warnings in case of Advanced topics
Based on #3713 a  number of problems were solved, but also some new issues introduced.
- BaseDoxyfile.h see to it that the CGALAdvancedBegin is in a detailed part, so be sure to terminate the brief part by an extra carriage return
- commands like \pre, \note read till the beginning of the next section but a \htmlonly is not seen as a section separator, so insert an extra carriage return
- some places  missed an "Advanced" indicator, used the cgalAdvancedType here.

##Note
in Periodic_2_triangulation_2.h there appear to be a number of images that are a bit in thin air (Captions: "Insertion of a point on an edge." and "Insertion in a face."). Also just above these images theer are a number of functions that have documentation, but this is non-doxygen documentation and as such not seen by doxygen
2019-03-10 16:00:52 +01:00
Laurent Rineau f5836b2206 Merge branch 'releases/CGAL-4.13-branch' 2019-03-07 14:31:16 +01:00
Laurent Rineau 99fe1bc548 Merge branch 'releases/CGAL-4.12-branch' into releases/CGAL-4.13-branch 2019-03-07 14:26:47 +01:00
Sébastien Loriot 3887a21429 add missing text for brief of advanced class/type/function/concept 2019-03-05 08:01:17 +01:00
Andreas Fabri 6f836b5827 T2,T3,Mesh_2: backticks, lowercase, capitalize 2019-03-04 11:03:44 +01:00
Laurent Rineau 2671d056cf Merge pull request #3685 from afabri/CGAL-cleanup-GF
CGAL:  Clean up examples and tests
2019-02-28 20:48:48 +01:00
Laurent Rineau 8693f95dac Merge pull request #3619 from albert-github/feature/bug_headers
Update of headers
2019-02-22 16:39:09 +01:00
Maxime Gimeno 6f294c8d09 Documents precondition 2019-02-19 13:29:10 +01:00
Andreas Fabri 427deceb9e Do not #define short names in the T2 testsuite 2019-02-14 12:51:52 +01:00
Andreas Fabri 25819705f5 Polyhedron, Intersections, PSP 2019-02-14 11:06:13 +01:00
Sébastien Loriot 59bc453b42 first batch of replacement for level 1 in classified ref man
command used:
grep -l  "##" */doc/*/PackageDescription.txt | xargs  sed -i  -E 's/\#\#\s*([[:print:]]+[[:alnum:]])\s*\#\#\s*$/\\cgalCRPSection{\1}/'
2019-02-14 10:32:39 +01:00
Sébastien Loriot 42b9a0be04 fix level 2019-02-14 10:26:05 +01:00
Andreas Fabri 7a84f58c0d T2, Spatial_searching, Ridges, Stream_lines 2019-02-14 10:15:50 +01:00
Laurent Rineau fdd8357915
Merge pull request #3580 from afabri/Stream_support-Color-GF
Fix warnings (Add/remove copy constructors, and other warnings)

Co-authored-by: Laurent Rineau <laurent.rineau@cgal.org>
Co-authored-by: Mael <mael.rouxel.labbe@geometryfactory.com>
Co-authored-by: Maxime GIMENO <maxime.gimeno@gmail.com>
2019-02-13 15:25:07 +00:00
Laurent Rineau 82dd2b5cda Merge pull request #3669 from afabri/Triangulation_2-maybe_not_intialized-GF
Triangulation_2: Initialize to avoid warning
2019-02-13 15:38:25 +01:00
Laurent Rineau 9e056880e8 Better warning fix: do not initialize, and use CGAL_assume
Let the variable uninitialized, and instruct the compiler that the
condition where `i` remains uninitialized is an error condition.
2019-02-08 09:46:24 +01:00
Andreas Fabri a0ebd79e9d Triangulation_2: Initialize to avoid warning 2019-02-08 08:39:27 +01:00
Sébastien Loriot e4cbae525c Merge remote-tracking branch 'cgal/releases/CGAL-4.13-branch' into HEAD 2019-01-31 11:25:26 +01:00
Sébastien Loriot 99d842401a Merge remote-tracking branch 'cgal/releases/CGAL-4.12-branch' into HEAD 2019-01-31 11:24:50 +01:00
Laurent Rineau afc3de2894
Merge branch 'master' into Stream_support-Color-GF 2019-01-23 09:37:08 +01:00
Laurent Rineau 6ffd76a87e Merge pull request #2792 from afabri/Intersections_3-Add_missing_do_intersect-GF
Intersections_3:  Add missing do_intersect() overloads
2019-01-18 16:37:54 +01:00
Andreas Fabri 4bb714fd7b Fix OTR and T2 2019-01-18 10:34:47 +01:00
Mael Rouxel-Labbé 14150ef95c Revert commit b307771 ("bug fix for natural_neighbor_coordinates_2...
... using a small feature in the conflict zone functions of
Delaunay_triangulation_2")

See concerns raised in the (not-actually-approved) small feature:

https://cgal.geometryfactory.com/CGAL/Members/wiki/Features/Small_Features/DT2_strict_and_weak_conflict_zone
2019-01-14 11:19:21 +01:00
Mael Rouxel-Labbé 1e27cfba44 Add layers.xy data file for T2 tests 2019-01-11 14:38:35 +01:00
Mael Rouxel-Labbé 502c28796d Clarify 'last' ==> 'top' 2019-01-11 13:56:06 +01:00
Andreas Fabri cf1d116d97 Remove files 2019-01-11 13:47:39 +01:00
Andreas Fabri 0ef8b84b00 Remove Weighted_point doc 2019-01-11 13:47:18 +01:00
Andreas Fabri 7009079e0c Move files to include/CGAL/Triangulation_2/internal and remove deprecated files 2019-01-11 13:46:58 +01:00
Mael Rouxel-Labbé 04f3ad63fa Added some sanity tests for the T2 find_conflict functions 2019-01-11 12:33:16 +01:00
Mael Rouxel-Labbé 28ce2a5240 Fixed stack order in non recursive conflict walking
Edges must be output in a CCW order, which is achieved by walking ccw-ly first.
In the recursive function, we correctly call 'propagate(..., ccw(j))' first.
For the non-recursive version which uses a stack, then we must add 'ccw(j)'
last since the stack is a LIFO structure.
2019-01-11 12:32:43 +01:00
Andreas Fabri 630066dd24 Fix Mesh_2 testsuite 2019-01-10 17:31:54 +01:00
Laurent Rineau 8121e872ab Merge pull request #3513 from sloriot/CGAL-fix_maybe_uninit_vars_wrngs_2
Fix some wmaybe-uninitialized warnings
2018-12-19 16:08:55 +01:00
Sébastien Loriot c2f7814f19 prevent maybe-uninitialized warnings
they were triggered by
`l1 = t.line_walk(POINT(xr_left, yr_top), POINT(xr_right, yr_top), hface1);`
in `CGAL/apply_to_range.h`

Seen when compiling targets:
  Constrained_Delaunay_triangulation_2
  Polyline_simplification_2
  Delaunay_triangulation_2
2018-11-24 14:42:26 +01:00
Maxime Gimeno d6cfa1a868 Fix CMake warnings about CMP for Visual 2017 2018-11-21 16:17:39 +01:00