sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
7413 commits 112 branches 95 tags 181 MiB
Commit graph

7413 commits

This branch
This branch
All branches
Author SHA1 Message Date
artemp
5eb406c7df geojson parser : only close path if we have at least 3 vertices 2013-11-20 16:00:11 +00:00
Dane Springmeyer
a6a4448e3d benchmarks: correct shebang 2013-11-19 13:21:00 -08:00
Dane Springmeyer
df3ad9e0f9 travis: run benchmarks 2013-11-19 12:33:44 -08:00
Dane Springmeyer
3ce92d71fe benchmark: fix formatting 2013-11-19 12:33:30 -08:00
Dane Springmeyer
4397cfe279 make benchmark run against local libmapnik 2013-11-19 12:33:14 -08:00
Dane Springmeyer
7cfb1e417a revised benchmarking system 2013-11-19 12:23:37 -08:00
Dane Springmeyer
c480d9d878 break out benchmark suite into individual cpp 2013-11-14 23:11:21 -08:00
Dane Springmeyer
03fdf7e596 Merge branch '2.3.x' of github.com:mapnik/mapnik 
Conflicts:
	src/deepcopy.cpp
	src/expression.cpp
	src/rule.cpp
 2013-11-13 20:00:13 -08:00
Dane Springmeyer
46f19ff185 benchmarks: more reasonable threaded double to string results 2013-11-13 19:42:25 -08:00
Dane Springmeyer
5de5ffb764 remove unused and broken deepcopy support to be replaced in #2081 - refs #1390 and #946 2013-11-13 19:26:17 -08:00
Dane Springmeyer
4ae6c0ac61 fix typo 2013-11-13 18:47:38 -08:00
Dane Springmeyer
d10eb830a2 silence warnings in load_map/save_map tests for now 2013-11-13 18:45:30 -08:00
Dane Springmeyer
2564c00420 expression parser - avoid extra level of indirection 2013-11-13 18:44:58 -08:00
Dane Springmeyer
dc3fad51a3 add test for render_with_detector + fix scale rendering tests - refs #2075 2013-11-13 10:45:23 -08:00
Dane Springmeyer
6844863a89 Abort pending postgis connections when exception occurs 
- patch from @abonnasseau
  - closes #2042
  - refs #2069
 2013-11-12 18:38:39 -08:00
Dane Springmeyer
410c65eb37 consistenly use std::memcpy and std::memset 2013-11-09 23:02:24 -08:00
Dane Springmeyer
2cc3d82a87 iwyu 2013-11-08 19:13:51 -08:00
Dane Springmeyer
81869a5532 iwyu 2013-11-08 19:11:06 -08:00
Dane Springmeyer
73faa94306 tests: smaller font sizes and ensure labels are on top 2013-11-08 18:41:00 -08:00
Dane Springmeyer
53e95bb506 Merge pull request #2074 from mapnik/text-refactor 
Organize text code in subdirectory
 2013-11-08 17:31:52 -08:00
Dane Springmeyer
cb614af83e iwyu 2013-11-07 20:24:10 -08:00
Dane Springmeyer
c7a6265869 organize text code in subdirectory 2013-11-07 20:09:22 -08:00
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