Dane Springmeyer
|
093d857ddc
|
Add support for 64 bit field types in GDAL 2.0 - closes #2685
|
2015-05-19 22:39:39 -07:00 |
|
Blake Thompson
|
87fb41907a
|
Added template to geometries
|
2015-04-09 15:22:51 -05:00 |
|
Dane Springmeyer
|
546e46756c
|
fix ogr plugin compile
|
2015-03-24 14:16:28 -07: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
|
ac1ffa2bfb
|
move geometry.hpp into path.hpp and update code base to reflect this change
|
2015-03-24 12:42:09 +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
|
1994b1c25f
|
update ogr plugin to new geometry
|
2015-03-21 20:08:07 -07:00 |
|
artemp
|
aa5ae6b843
|
update markers_symbolizer to work with mapnik-geometry (work-in-progress)
|
2015-03-05 15:07:23 +01:00 |
|
Dane Springmeyer
|
578f8a7c29
|
report proj4 string in extra metadata for ogr plugin - refs #2650
|
2015-02-09 15:46:00 -08:00 |
|
artemp
|
333965b588
|
update copyright year
|
2014-11-20 15:25:50 +01:00 |
|
Dane Springmeyer
|
83588937b9
|
silence boost warnings
|
2014-10-21 16:37:27 -07:00 |
|
Dane Springmeyer
|
225810e3ee
|
ogr: also accept 'inline' arg like geojson/topojson/csv plugins
|
2014-08-25 11:59:32 -07:00 |
|
Dane Springmeyer
|
7c1f9b1490
|
fix compile with older OGR
|
2014-08-18 21:33:37 -07:00 |
|
Dane Springmeyer
|
a4c926ac8a
|
don't throw for OGR layers with no features - refs #2260 #2352 #2354
Conflicts:
tests/python_tests/ogr_test.py
|
2014-08-15 19:49:33 -07:00 |
|
Joel Brown
|
c517b20237
|
add ogr plugin error handling to master/3.x
|
2014-08-12 23:09:42 -07:00 |
|
Dane Springmeyer
|
c604e925f5
|
apply #2350 to master/3.x too
|
2014-08-12 11:44:34 -07:00 |
|
artemp
|
fe215a684e
|
c++11 style : replace (almost) all typedef with type alias's
|
2014-07-07 18:23:15 +01: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 |
|
artemp
|
b197cbcdb7
|
tidy up
|
2014-06-25 09:01:20 +01:00 |
|
Dane Springmeyer
|
b237a604dd
|
fix #2283
|
2014-06-24 17:51:28 -07: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
|
a600a1fb91
|
improvements to GDAL 2.x handling - refs #2259 amends cbdd112223
|
2014-06-02 20:25:55 -07:00 |
|
Dane Springmeyer
|
dcbedc007a
|
support for GDAL >= 2.0 in ogr plugin - refs #2259
|
2014-06-02 20:25:48 -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
|
e8ee02877d
|
fix OGR plugin error reporting
|
2014-04-22 15:31:19 -07:00 |
|
Dane Springmeyer
|
6433d9482e
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
include/mapnik/symbolizer.hpp
src/agg/agg_renderer.cpp
src/agg/process_line_pattern_symbolizer.cpp
src/agg/process_line_symbolizer.cpp
src/agg/process_polygon_pattern_symbolizer.cpp
src/agg/process_polygon_symbolizer.cpp
src/cairo_renderer.cpp
src/feature_type_style.cpp
src/grid/process_line_pattern_symbolizer.cpp
src/grid/process_line_symbolizer.cpp
src/grid/process_markers_symbolizer.cpp
src/grid/process_polygon_pattern_symbolizer.cpp
src/grid/process_polygon_symbolizer.cpp
|
2014-03-10 00:05:56 -07:00 |
|
Dane Springmeyer
|
0fbcc12678
|
fix static linking of gdal/ogr plugins on linux - refs mapnik/mapnik-packaging#123
|
2014-02-27 14:40:09 -08:00 |
|
Dane Springmeyer
|
6f14228e30
|
fix static linking of gdal/ogr plugins on linux - refs mapnik/mapnik-packaging#123
|
2014-02-27 14:02:24 -08:00 |
|
Dane Springmeyer
|
bcde6ae631
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
|
2014-02-09 13:27:24 -08:00 |
|
Dane Springmeyer
|
538af2515d
|
fix rendering of multiple styles with OGR plugin - refs #2048 and mapbox/tilemill#2202
|
2014-01-31 19:13:24 -08:00 |
|
Dane Springmeyer
|
b3e6ea48b0
|
fix rendering of multiple styles with OGR plugin - refs #2048 and mapbox/tilemill#2202
|
2014-01-31 19:12:31 -08:00 |
|
Dane Springmeyer
|
a98de6a348
|
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
Conflicts:
include/mapnik/expression_grammar_impl.hpp
src/expression.cpp
|
2014-01-27 13:56:36 -08:00 |
|
Dane Springmeyer
|
777e067770
|
remove workaround for boost less than 1.46 since 1.47 is now the min needed - refs #1082
|
2014-01-27 12:24:20 -08: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
|
5393978dd4
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-11-07 18:16:10 -08:00 |
|
Dane Springmeyer
|
0b39a7eb12
|
ogr plugin: remove unused code
|
2013-11-07 14:43:12 -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
|
89586fbdf1
|
+ only extract expected types from mapnik::parameters
aka mapnik::value_xxx types
|
2013-10-09 15:32:47 +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 |
|
Dane Springmeyer
|
e0026f3df2
|
use icu:: namespace and start isolating icu impl by consistenly using mapnik::value_unicode_string
|
2013-08-13 18:52:04 -04:00 |
|
Dane Springmeyer
|
cf6e08aa52
|
disable (by default) use of shared memory in ogr plugin
|
2013-08-13 14:26:48 -04:00 |
|
Dane Springmeyer
|
134cbc3eec
|
forward declare mapped_region in mapped_memory_cache.hpp and other shared memory fixups
|
2013-08-13 14:13:56 -04:00 |
|