artemp
|
61f42b229d
|
update to templated mapnik-geometry
|
2015-04-10 14:16:26 +02:00 |
|
Blake Thompson
|
87fb41907a
|
Added template to geometries
|
2015-04-09 15:22:51 -05:00 |
|
artemp
|
4389c80d84
|
and finaly, rename 'new_geometry' namespace to 'geometry'
|
2015-03-24 14:21:28 +01:00 |
|
artemp
|
7e03d41606
|
rename geometry_impl.hpp to geometry.hpp
|
2015-03-24 13:32:05 +01:00 |
|
artemp
|
1cf0a897ac
|
move datasource::geometry_t into separate header and rename -> datasource_geometry_t to avoid cyclic dependencies issue
to_ds_type - return actual datasource_geometry_t (remove optional)
update across datasources
experssions - revert to using
|
2015-03-24 12:13:31 +01:00 |
|
Dane Springmeyer
|
dca44f799b
|
update osm plugin to new geometry
|
2015-03-22 15:46:27 -07:00 |
|
artemp
|
aa5ae6b843
|
update markers_symbolizer to work with mapnik-geometry (work-in-progress)
|
2015-03-05 15:07:23 +01:00 |
|
artemp
|
333965b588
|
update copyright year
|
2014-11-20 15:25:50 +01:00 |
|
Dane Springmeyer
|
f34ac45b86
|
remove unneeded osm files - refs #2547
|
2014-10-27 08:56:58 -07:00 |
|
Dane Springmeyer
|
383aa8c41a
|
Merge pull request #2294 from Vanuan/patch-1
OSM plugin: area=yes is a polygon
|
2014-07-14 19:41:38 -07:00 |
|
artemp
|
04facd3542
|
mode range ``for loops``
|
2014-07-08 17:02:22 +01:00 |
|
John Yani
|
5acc303a87
|
OSM plugin: area=yes is a polygon
Why this line is not here yet?
|
2014-07-05 17:56:22 +03:00 |
|
artemp
|
0702679bb0
|
don't call *params.get<std::string>("type"), instead use static datasource::name()
(FIXME: consider removing redundant 'name' in feature_layer_descriptor)
|
2014-06-26 10:51:24 +01:00 |
|
Dane Springmeyer
|
d5ac946706
|
remove libcurl dependency
Conflicts:
plugins/input/osm/dataset_deliverer.cpp
plugins/input/osm/osm.cpp
plugins/input/osm/osm_datasource.cpp
plugins/input/osm/test.cpp
|
2014-06-16 09:52:26 -07:00 |
|
artemp
|
3ded23fbab
|
move make_unique out of std namespace and allow building with c++14 compilers
( -std=c++1y )
|
2014-06-12 15:14:05 +01:00 |
|
Dane Springmeyer
|
d0b357cab7
|
scons: support MAPNIK_NAME option to customize libmapnik name for custom packaging
|
2014-06-09 13:55:56 -07:00 |
|
Dane Springmeyer
|
9e9747ffad
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
src/agg/process_building_symbolizer.cpp
src/cairo_context.cpp
src/cairo_renderer.cpp
src/grid/process_building_symbolizer.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
tests/python_tests/images/support/marker-text-line-scale-factor-0.899.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.5.png
tests/python_tests/images/support/marker-text-line-scale-factor-1.png
tests/python_tests/images/support/marker-text-line-scale-factor-10.png
tests/python_tests/images/support/marker-text-line-scale-factor-100.png
tests/python_tests/images/support/marker-text-line-scale-factor-2.png
tests/python_tests/images/support/marker-text-line-scale-factor-5.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/test.py
|
2014-04-24 21:44:28 -07:00 |
|
Dane Springmeyer
|
39737c5f1d
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
.travis.yml
CHANGELOG.md
bindings/python/build.py
include/mapnik/feature_style_processor_context.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/json/feature_collection_grammar.hpp
include/mapnik/json/feature_collection_parser.hpp
include/mapnik/json/feature_generator_grammar.hpp
include/mapnik/json/feature_parser.hpp
include/mapnik/json/geojson_generator.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_parser.hpp
plugins/input/gdal/gdal_featureset.cpp
plugins/input/geojson/geojson_datasource.cpp
plugins/input/occi/occi_featureset.cpp
plugins/input/osm/osm_featureset.cpp
plugins/input/postgis/build.py
plugins/input/postgis/connection.hpp
src/agg/agg_renderer.cpp
src/build.py
src/cairo_context.cpp
src/datasource_cache.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
src/grid/process_text_symbolizer.cpp
src/json/feature_grammar.cpp
tests/cpp_tests/fontset_runtime_test.cpp
tests/visual_tests/images/collision-600-400-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-512-512-2.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-1.0-agg-reference.png
tests/visual_tests/images/image-filters-multi-blur-inflate-512-512-2.0-agg-reference.png
tests/visual_tests/images/lines-1-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-1-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-2-400-400-1.0-cairo-reference.png
tests/visual_tests/images/lines-2-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-2-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-2-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-3-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-3-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-5-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-5-400-400-2.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-5-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-5-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-1.0-agg-reference.png
tests/visual_tests/images/lines-6-200-200-2.0-agg-reference.png
tests/visual_tests/images/lines-6-400-400-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-1.0-agg-reference.png
tests/visual_tests/images/lines-6-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-1.0-agg-reference.png
tests/visual_tests/images/lines-6-800-800-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-agg-reference.png
tests/visual_tests/images/lines-shield-600-600-2.0-cairo-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-1.0-agg-reference.png
tests/visual_tests/images/shield-on-polygon-600-400-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-495-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-497-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-499-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-1.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-1-505-100-2.0-cairo-reference.png
tests/visual_tests/images/shieldsymbolizer-1-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-3-510-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-490-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-495-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-497-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-498-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-499-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-500-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-501-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-502-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-505-100-2.0-agg-reference.png
tests/visual_tests/images/shieldsymbolizer-4-510-100-2.0-agg-reference.png
tests/visual_tests/test.py
|
2014-04-24 14:50:55 -07:00 |
|
Dane Springmeyer
|
ecbba52bc0
|
add code comment about curl [skip ci]
|
2014-04-09 09:44:43 -04:00 |
|
Dane Springmeyer
|
1dd481f8f7
|
fallback if pkg-config fails for libcurl or libpq
|
2014-04-09 09:40:40 -04:00 |
|
Dane Springmeyer
|
f1dd07fd64
|
fix static linking of the osm plugin against libcurl
|
2014-04-08 23:15:33 -04:00 |
|
Dane Springmeyer
|
c9e3248cec
|
more auto_ptr usage to avoid bare geometry pointers
|
2014-03-12 13:11:51 -07:00 |
|
Dane Springmeyer
|
e9ca9c8790
|
symbolizer-expressions replayed against latest master
|
2013-11-27 22:50:15 -08:00 |
|
artemp
|
eb3da7d32d
|
c++11 : use nullptr instead of NULL
|
2013-11-27 15:54:16 +00:00 |
|
Dane Springmeyer
|
410c65eb37
|
consistenly use std::memcpy and std::memset
|
2013-11-09 23:02:24 -08:00 |
|
Dane Springmeyer
|
710d558218
|
scons: simplify linkflags/ldflags setting / attempt to fix #2025
|
2013-10-22 16:35:46 -04:00 |
|
artemp
|
7adee4ab36
|
c++11 : remove boost::make_shared includes
|
2013-10-17 15:09:56 +01:00 |
|
artemp
|
09ce29489e
|
use const std::unique_ptr<> instead of boost::scoped_ptr<>
|
2013-09-20 14:22:58 +01:00 |
|
artemp
|
62af2e6765
|
+ replace <boost/shared_ptr.hpp> with <memory>
|
2013-09-20 14:13:23 +01:00 |
|
artemp
|
b315eb2167
|
+ use std::shared_ptr and std::make_shared
|
2013-09-20 14:01:27 +01:00 |
|
artemp
|
d4b9a48cb1
|
+ geometry::types Exterior/Interior polygon loops
|
2013-09-03 12:15:31 +01:00 |
|
artemp
|
4f4e2b001e
|
Merge branch 'master' into c++11
Conflicts:
SConstruct
benchmark/run.cpp
bindings/python/mapnik_datasource.cpp
bindings/python/mapnik_feature.cpp
bindings/python/python_optional.hpp
include/mapnik/css_color_grammar.hpp
include/mapnik/expression_grammar.hpp
include/mapnik/feature.hpp
include/mapnik/feature_style_processor_impl.hpp
include/mapnik/image_filter_types.hpp
include/mapnik/image_util.hpp
include/mapnik/json/geometry_generator_grammar.hpp
include/mapnik/json/geometry_grammar.hpp
include/mapnik/processed_text.hpp
include/mapnik/tiff_io.hpp
include/mapnik/util/geometry_svg_generator.hpp
include/mapnik/util/geometry_wkt_generator.hpp
include/mapnik/utils.hpp
include/mapnik/webp_io.hpp
include/mapnik/wkt/wkt_grammar.hpp
plugins/input/shape/shape_datasource.cpp
plugins/input/shape/shapefile.hpp
src/expression_grammar.cpp
src/expression_string.cpp
src/image_util.cpp
src/json/feature_collection_parser.cpp
src/json/feature_parser.cpp
src/miniz.c
src/symbolizer_helpers.cpp
src/tiff_reader.cpp
src/webp_reader.cpp
tests/cpp_tests/geometry_converters_test.cpp
tests/cpp_tests/image_io_test.cpp
tests/cpp_tests/map_request_test.cpp
tests/python_tests/image_test.py
tests/visual_tests/test.py
|
2013-08-30 09:46:09 +01:00 |
|
Tom Hughes
|
4a6231389d
|
Stop the osm input plugin truncating ID values on 32 bit platforms
|
2013-07-11 00:39:52 +01:00 |
|
Dane Springmeyer
|
0365d3e081
|
start centralizing filesystem operations in mapnik::util::fs - refs #1177
|
2013-06-02 19:28:24 -07:00 |
|
Dane Springmeyer
|
3fbf4df67d
|
add support for statically linking datasource input plugins - closes #1810 and #1821 - refs #249
|
2013-05-16 11:55:58 -07:00 |
|
artemp
|
31a506f3cb
|
+ use more consise c++11 syntax
|
2013-05-06 15:52:04 +01:00 |
|
Dane Springmeyer
|
f483e590d8
|
remove way out of date and unmaintained demo app previously part of osm plugin code
|
2013-01-17 13:41:02 -08:00 |
|
Dane Springmeyer
|
d718e95ed6
|
use std::strlen not strlen from c
|
2013-01-15 13:32:09 -08:00 |
|
Dane Springmeyer
|
b5c06965ac
|
refactor expression and value type usage to speed up compile time
|
2013-01-08 14:17:31 -08:00 |
|
Dane Springmeyer
|
4bd5484cdb
|
fixup includes and value type and params usage across plugins
|
2013-01-04 09:23:06 -08:00 |
|
Dane Springmeyer
|
000b714eae
|
fix more clang++ -Wshadow warnings
|
2013-01-03 12:37:45 -08:00 |
|
artemp
|
9ad4f91780
|
+ should work correctly now (mapnik::value_null)
|
2013-01-03 15:08:11 +00:00 |
|
artemp
|
b7f463514d
|
+ don't add dummy attributes
|
2013-01-03 15:07:41 +00:00 |
|
Dane Springmeyer
|
66a5c26fdc
|
leverage mapnik::value_integer for feature.id() and grid rendering buffer - refs #1662
|
2012-12-19 19:24:52 -08:00 |
|
Dane Springmeyer
|
7b39333234
|
remove as much mutable as possible
|
2012-12-17 12:59:15 -08:00 |
|
Dane Springmeyer
|
c5410fac7e
|
remove bind option for datasources - refs #962
|
2012-12-17 10:03:07 -08:00 |
|
Dane Springmeyer
|
c0021d0760
|
remove unused iostream includes and unnecessary usage of ostringstream - refs #1055
|
2012-12-06 23:06:12 -08:00 |
|
Dane Springmeyer
|
c95b8ff8d7
|
fix visual tests by restoring old hack to prevent rendering of all names
|
2012-11-27 18:15:56 -08:00 |
|
Dane Springmeyer
|
8c2604e69c
|
osm input: remove string hack and set feature_id to osm node id
|
2012-10-16 17:46:24 -07:00 |
|
Manel Clos
|
8f7083d14d
|
Add tolerance parameter to features_at_point
Make map.query_point() always pass tolerance to datasources
|
2012-09-28 15:12:10 +02:00 |
|