Commit graph

13084 commits

Author SHA1 Message Date
Artem Pavlenko
62b10d83be Merge pull request #3782 from IMQS/angled-point-master
Add new angled-point marker placement mode for lines
2017-10-26 17:27:08 +02:00
Ben Harper
05849f0da5 Add new angled-point marker placement mode for lines
This adds a new mode called 'angled-point' to the marker-placement modes.
The full list of modes is then:
  point, angled-point, interior, line, vertex-first, vertex-last

Angled point is identical to point, except that when placing a marker on
a line, the marker's angle is taken from the angle of the line segment.

There is another possible use of the "angled-point" concept for polygons,
and that is for placing labels on stand (aka erf) polygons. By computing
a dominant angle for a mostly rectangular polygon, this can produce quite
good results. I'm not sure whether I should implement that now, or if I
could do that later.
2017-10-26 15:09:17 +02:00
Artem Pavlenko
f02a259011 remove depth limit 2017-10-13 09:47:26 +02:00
Dane Springmeyer
e5b837ff97 remove -Wc++14-extensions flag (added in 064b99168) (#3778) 2017-10-11 16:26:39 +02:00
Artem Pavlenko
cdd8b35112 Merge branch 'mapycz-fix-viewer-linking' 2017-10-09 16:06:33 +02:00
Jiri Drbalek
4952baf494 fix linking of viewer 2017-10-09 11:35:24 +00:00
Jiri Drbalek
8c7d7e25cd update visual tests 2017-10-06 09:52:30 +00:00
talaj
8347778abb fix memory leak (#3775) 2017-10-06 09:27:58 +02:00
Artem Pavlenko
8dc1456766 update test-data 2017-09-29 10:26:04 +02:00
Artem Pavlenko
de9364d447 update deps + test data 2017-09-29 10:04:00 +02:00
talaj
377253bcc8 Check duplicate style names (#3770)
* Ported map I/O tests from Python.

These test loading, saving and round-tripping Map XML, and are
pretty much a direct port of the old Python `load_map_test.py` and
`save_map_test.py`.

* check duplicate style name

* update test data
2017-09-28 15:51:55 +02:00
Jiri Drbalek
43ea5dcb82 update visual tests data 2017-09-27 13:13:27 +00:00
Artem Pavlenko
eefe3de34b update visual data post centroid PR 2017-09-26 09:47:26 +02:00
Artem Pavlenko
71321e8e6b update protozero 2017-09-26 09:47:09 +02:00
Artem Pavlenko
53ad3f0fe8 increase init depth to 20 2017-09-25 16:53:16 +02:00
Artem Pavlenko
94ce4d530a update tests 2017-09-25 16:52:59 +02:00
talaj
f3cf1ad388 Fix centroid and interior algorithms (#3771)
* fix interior algorithm - closing segment handling

* fix centroid algorithm - closing segment handling

* update visual tests
2017-09-25 15:45:02 +02:00
Artem Pavlenko
304cce8efa update protozero to the latest 2017-09-22 15:21:32 +02:00
Artem Pavlenko
3d4963f40c move implementatio into *.cpp + return 'closest_point_result' struct. 2017-09-22 13:21:50 +02:00
Artem Pavlenko
afb2af84f7 assign second point 2017-09-22 13:21:02 +02:00
Artem Pavlenko
f210699884 add more tests 2017-09-22 13:20:23 +02:00
Artem Pavlenko
143d1e57cf add 'closest_point' geometry algorithm 2017-09-21 15:40:30 +02:00
Artem Pavlenko
e9f912bba9 Reserve memory via size() of range method in protozero (10c631d7e4 ) 2017-09-20 10:07:43 +02:00
Artem Pavlenko
fa96232258 update visual data 2017-09-20 09:54:25 +02:00
Artem Pavlenko
5d5ef602be rename 'geometry_type' to 'topojson_geometry_type' to avoid names clashing
(this was causing miscompilation on linux (ubuntu 17.04/clang))
2017-09-18 11:35:39 +01:00
talaj
13d678d9af visual tests: allow to ignore particular renderer (#3768)
* visual tests: refactor parsing parameters from the style

* visual tests: allow to ignore particular renderer

* update visual tests
2017-09-14 14:21:30 +01:00
Artem Pavlenko
c07397e71b update protozero 2017-09-14 11:25:51 +01:00
Artem Pavlenko
5a87d8fef9 update deps 2017-09-13 10:51:36 +01:00
talaj
d14203561d color font support improvements (#3758)
👍
2017-09-13 10:14:46 +01:00
talaj
c7c10fed46 basic unit test for feature_style_processor (#3766) 2017-09-13 10:14:13 +01:00
talaj
c80cde6044 visual tests: report failed tests (#3765) 2017-09-13 10:13:51 +01:00
Artem Pavlenko
acec6ae824 Merge branch 'master' into bbox-index 2017-09-12 14:57:12 +01:00
Artem Pavlenko
e54287293f Merge branch 'mapycz-nested-layers-fixes' 2017-09-12 14:10:22 +01:00
Artem Pavlenko
8bc080c7b8 Merge branch 'nested-layers-fixes' of https://github.com/mapycz/mapnik into mapycz-nested-layers-fixes 2017-09-12 14:09:47 +01:00
Artem Pavlenko
02c6124559 Revert "remove legacy defines"
This reverts commit ebb8d3b3ed.
2017-09-12 09:54:40 +01:00
Artem Pavlenko
01574e8038 update comment 2017-09-12 09:43:50 +01:00
Artem Pavlenko
797e8c7553 Merge branch 'master' into bbox-index 2017-09-11 17:59:23 +01:00
Artem Pavlenko
e97759d01b geojson test - require throwing on an empty feature collection
(not sure this is correct but needed to preserve 3.0.x behaviour)
2017-09-11 17:58:26 +01:00
Dane Springmeyer
aafc5d6d51 revert accidentally committed change to geobuf plugin 2017-09-11 09:48:10 -07:00
Artem Pavlenko
f19ca6672e Merge branch 'master' into bbox-index 2017-09-11 17:32:35 +01:00
Artem Pavlenko
04f9db4b18 minor format 2017-09-11 17:30:37 +01:00
Artem Pavlenko
6e9c56ee2c geojson.input - check and throw if bounding box extrator returns no boxes and not all input consumed (preserve 3.0.x caps) 2017-09-11 17:28:09 +01:00
Jiri Drbalek
6777721391 enclosing calls forgotten in https://github.com/mapnik/mapnik/pull/3474 2017-09-11 15:25:19 +00:00
Artem Pavlenko
b2f3fdb73b Merge branch 'master' into bbox-index 2017-09-11 10:47:50 +01:00
Artem Pavlenko
ebb8d3b3ed remove legacy defines 2017-09-11 10:46:57 +01:00
Dane Springmeyer
3135d58a40 Merge pull request #3762 from mapnik/collect-dep-data-paths-master
Port #3759 to master
2017-09-10 11:10:41 -07:00
Dane Springmeyer
13ff9e1706 adapt to spelling fix in svg tests 2017-09-10 10:22:08 -07:00
Dane Springmeyer
4bc7ec73de fix spelling in svg parser error 2017-09-10 08:59:54 -07:00
Dane Springmeyer
01bf0fb6ce make the configure script actually bash 2017-09-10 08:40:33 -07:00
Dane Springmeyer
8689048ba6 port #3759 to master 2017-09-10 08:19:04 -07:00