Dane Springmeyer
|
aff0c09f33
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-11-07 20:06:17 -08:00 |
|
Dane Springmeyer
|
9c82c0c957
|
enable deprecated features in clipper 6.x - refs https://github.com/mapbox/mapnik-vector-tile/issues/30
|
2013-11-07 20:04:37 -08: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
|
08fa9fd8ec
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
bindings/python/mapnik_building_symbolizer.cpp
bindings/python/mapnik_debug_symbolizer.cpp
bindings/python/mapnik_line_pattern_symbolizer.cpp
bindings/python/mapnik_line_symbolizer.cpp
bindings/python/mapnik_markers_symbolizer.cpp
bindings/python/mapnik_point_symbolizer.cpp
bindings/python/mapnik_polygon_symbolizer.cpp
bindings/python/mapnik_python.cpp
bindings/python/mapnik_raster_symbolizer.cpp
bindings/python/mapnik_shield_symbolizer.cpp
bindings/python/mapnik_symbolizer.cpp
|
2013-11-07 09:21:05 -08:00 |
|
Dane Springmeyer
|
08cfc5d0f3
|
travis: test all branches
|
2013-11-07 09:05:49 -08:00 |
|
Dane Springmeyer
|
f49654b160
|
png_reader: quote filenames in error output
|
2013-11-06 16:26:42 -08:00 |
|
Dane Springmeyer
|
6c8a8007e4
|
best practice: lways define NOMINMAX when including windows.h
|
2013-11-06 15:34:53 -08:00 |
|
Dane Springmeyer
|
f66fe78c03
|
png_reader ensure we throw early if a file_source cannot be opened
|
2013-11-06 15:34:26 -08:00 |
|
Dane Springmeyer
|
49829bf2f6
|
fix #1846 in 2.3.x branch for unix (msvc still a mystery)
|
2013-11-06 13:43:10 -08:00 |
|
Dane Springmeyer
|
84d9900862
|
upgrade clipper from 5.1.5->6.0.0
|
2013-11-06 13:37:30 -08:00 |
|
Dane Springmeyer
|
2e8c383730
|
travis: start testing on all branches again
|
2013-11-06 11:56:47 -08:00 |
|
Dane Springmeyer
|
d0619bc402
|
update copyright year for scons build files
|
2013-11-05 16:54:13 -08:00 |
|
Dane Springmeyer
|
9ba060e499
|
update changelog afer #2065
|
2013-11-05 16:43:08 -08:00 |
|
Dane Springmeyer
|
0250538149
|
add support for geometry-transform in pattern symbolizers - closes #2065
|
2013-11-05 16:40:09 -08:00 |
|
Dane Springmeyer
|
2db7d7c390
|
use std namespace for math functions
|
2013-11-05 15:53:07 -08:00 |
|
Dane Springmeyer
|
fe5b3713ba
|
python bindings: reduce compile times by consolidating code in fewer cpp files
|
2013-11-05 15:11:23 -08:00 |
|
Dane Springmeyer
|
b08908b5f4
|
tests: no need to reference khmer font directory for bug2037
|
2013-11-04 21:06:32 -08:00 |
|
Dane Springmeyer
|
ca25d6797a
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
|
2013-11-04 09:40:58 -08:00 |
|
Dane Springmeyer
|
4fb6f25dcd
|
scons: back off using -Wshadow since this triggers too much spurious noise with g++-4.7 and clang++/libc++
|
2013-11-04 09:39:24 -08:00 |
|
Dane Springmeyer
|
412f90a3ee
|
Fix -Wshadow warning
|
2013-11-04 09:38:04 -08:00 |
|
artemp
|
afd58da6e2
|
geojson - feature_collection_parser
(allow single feature and geometry input)
|
2013-11-04 12:39:10 +00:00 |
|
Dane Springmeyer
|
9428f7f018
|
csv plugin: fix syntax after merge
|
2013-11-03 23:17:40 -08:00 |
|
Dane Springmeyer
|
f998b2bda6
|
Merge branch '2.3.x' of github.com:mapnik/mapnik
Conflicts:
deps/agg/build.py
deps/clipper/build.py
include/mapnik/feature_style_processor_impl.hpp
plugins/input/csv/csv_datasource.cpp
|
2013-11-03 23:10:21 -08:00 |
|
Dane Springmeyer
|
26f362db9a
|
scons: do not (yet) default to using -Wconversion -Wno-sign-conversion
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
2d268d3a95
|
features_with_context: no need for default arg
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
f1c381e2c6
|
feature_style_processor: remove unused arg
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
a5f8ba5c6c
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:03 -08:00 |
|
Dane Springmeyer
|
d9bc3dbb81
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
eb1c976bc9
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
ae0a209295
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
a659332284
|
fix -Wsign-conversion warnings
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
052548d636
|
fix signed/unsigned usage
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
0f8c931530
|
scons: suncc support is not maintained, remove it
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
6ffd0e9bc2
|
map size calculations: be explicit about types
|
2013-11-03 23:07:02 -08:00 |
|
Dane Springmeyer
|
1cd7a9228c
|
Merge branch '2.3.x' of https://github.com/mapnik/mapnik into 2.3.x
|
2013-11-03 15:26:50 -08:00 |
|
Dane Springmeyer
|
a656a7af25
|
tests: fix clipping test on windows by stripping newlines
|
2013-11-03 15:23:01 -08:00 |
|
Dane Springmeyer
|
dd5848aff0
|
fix linking on windows - accidentally broken in 8b5323f101 (restores fix from 03d8b6d9d7)
|
2013-11-03 15:22:28 -08:00 |
|
Dane Springmeyer
|
d4befc2706
|
update unifont from 5.1.20080907 to 6.3.20131020 - closes #2061
|
2013-11-01 11:34:26 -07:00 |
|
Dane Springmeyer
|
c1da56a6a0
|
scons: specialize default search path for icu on OS X since homebrew is so common now and icu is 'key-only'
|
2013-10-31 21:14:24 -07:00 |
|
Dane Springmeyer
|
a17006bdd3
|
scons: avoid pollution of global compiler flags from python plugin - closes #2060
|
2013-10-31 13:37:13 -07:00 |
|
Dane Springmeyer
|
8c9c277196
|
travis: use ubuntugis-unstable ppa for more recent gdal and proj4 - refs #2059
|
2013-10-31 12:33:32 -07:00 |
|
Dane Springmeyer
|
6513be924d
|
travis: also install gdal-dev so the gdal and ogr plugins are built and tests are run
|
2013-10-31 11:43:13 -07:00 |
|
Dane Springmeyer
|
6bbd8210f8
|
add more test files - amends 9886d84 - refs #2052
|
2013-10-30 12:00:57 -07:00 |
|
Dane Springmeyer
|
9886d844fe
|
Add a testcase to capture change in src_over compositing - refs #2052 and #1452
|
2013-10-30 11:59:57 -07:00 |
|
Dane Springmeyer
|
7612ff7b20
|
csv plugin: support user defined extent
|
2013-10-30 11:57:03 -07:00 |
|
artemp
|
febf712343
|
Revert "+ std::unordered_map to store properties"
This reverts commit d909c6dede.
|
2013-10-29 14:17:45 +00:00 |
|
artemp
|
3837c68762
|
use non-zero filling rule when rasterising lines
|
2013-10-29 12:26:33 +00:00 |
|
artemp
|
fe1c88f4a5
|
topojson : allow individual geometries not just geometry collections
|
2013-10-29 10:55:13 +00:00 |
|
Dane Springmeyer
|
1f4160f0f0
|
topojson: built up knowledge of attributes and geometry type + tests
|
2013-10-29 00:37:41 -07:00 |
|