Dane Springmeyer
11b0816d2a
sqlite plugin: use mapnik::geometry_container alias
2014-07-24 12:08:16 -07:00
Dane Springmeyer
d1336568c5
workaround old GDAL bug regarding rgba images and alpha reporting - closes #2310
2014-07-22 14:33:59 -07:00
Sandro Santilli
25c237fdd9
Ensure read-only transactions
...
Closes #2142
2014-07-16 11:04:39 +02: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
artemp
fe215a684e
c++11 style : replace (almost) all typedef with type alias's
2014-07-07 18:23:15 +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
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
Sandro Santilli
4c525e0e25
Makefile tweaks for helloworld template plugin
...
- Do not force use of clang++ to build the plugin (broken on recent debian
and derivates: https://bugs.debian.org/643959 )
- Do not force clean on install
- Use -fPIC to build objects (or g++ complains)
2014-06-16 09:52:26 -07: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
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
artemp
22aa3f4aef
create shape_io object per featureset to allow datasource sharing
2014-05-30 15:37:44 +01:00
artemp
1cb03bac2f
mark is_open as const
2014-05-30 15:37:23 +01:00
artemp
2812735dfd
c++ style
2014-05-30 10:15:29 +01:00
Dane Springmeyer
e300a41dca
variables now available as postgis datasource tokens
2014-05-13 20:47:22 -07:00
artemp
99bbb10290
c++11 : use int types from <cstdint>
2014-05-06 18:06:47 +01:00
Dane Springmeyer
ba17b9e374
add TODO comments for grammars that are not stateless - refs #2231
2014-04-30 11:04:26 -07:00
Dane Springmeyer
97a45f21bb
all static grammar usage const + xml_tree cleanups
2014-04-30 10:42:05 -07:00
Dane Springmeyer
8c1e69fdb8
static grammars
...
- construct on first use
- allows for faster map loading and unloading of xml loading tree
- modified expression and transform grammars to not take args/not crash
- simplifies interfaces, allows fast parsing from python without passing grammar instance
2014-04-30 00:11:27 -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
02d4e7fd06
postgis geometry type detection - fall through to detecting type on individual geometries if the geometry_columns only reports 'geometry' - refs mapbox/tilemill/#2099
2014-04-22 15:31:06 -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
7351879e6f
Merge pull request #2193 from strk/2.3.x-no-terminate-pgis-dtor
...
Do not throw in postgis_datasource destruction if backend is down
2014-04-04 18:20:59 -07:00
Dane Springmeyer
55ba8d38ae
Merge pull request #2182 from strk/2.3.x-all-async
...
Have all queries use the async interface
2014-04-03 23:59:11 -07:00
Dane Springmeyer
ce1ff9902e
better linking for postgis.input using pkg-config
2014-04-02 13:26:33 -07:00
Sandro Santilli
32680434fe
Do not throw in postgis_datasource destruction if backend is down
...
... and persist_connections is true!
Closes #2191
2014-03-26 15:39:53 +01:00
Sandro Santilli
9d04d9fef9
Do not throw in postgis_datasource destruction if backend is down
...
... and persist_connections is true!
Closes #2191
2014-03-26 15:35:55 +01:00
Dane Springmeyer
6c4ea66509
postgis: use max float for no-op bbox token - closes #2158
2014-03-12 13:31:45 -07:00
Dane Springmeyer
551718df59
postgis: use max float for no-op bbox token - closes #2158
2014-03-12 13:31:14 -07:00
Dane Springmeyer
c9e3248cec
more auto_ptr usage to avoid bare geometry pointers
2014-03-12 13:11:51 -07:00
Sandro Santilli
bf3500d757
Have all queries use the async interface
2014-03-11 11:10:41 +01: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
Sandro Santilli
ca9b0fccab
Do not attempt to PQclear a null PQresult*
2014-03-09 21:07:34 -07:00
Dane Springmeyer
b1e9aa2140
Merge pull request #2176 from strk/2.3.x-segfault-on-execute
...
Do not attempt to PQclear a null PQresult*
2014-03-09 21:04:48 -07:00
Sandro Santilli
749118cdee
Make sure status() returns a message also on bad connection
...
Closes #2173 .
2014-03-09 21:03:44 -07:00
Sandro Santilli
d36c39d9be
Make sure status() returns a message also on bad connection
...
Closes #2173 .
2014-03-06 10:18:21 +01:00
Sandro Santilli
9a1996620e
Do not attempt to PQclear a null PQresult*
2014-03-06 10:04:10 +01:00
Dane Springmeyer
871b17f5d9
fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123
2014-02-27 14:40:14 -08: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
f2021971f0
fix postgis plugin linking when statically linking on linux - refs mapnik/mapnik-packaging#123
2014-02-27 14:23:57 -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
artemp
ecc5acbdb9
attempt to handle multi-polygons in shape.input
2014-02-24 15:20:06 +00: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
f286363ad0
more consistent memset/memcpy usage
2014-01-28 15:05:10 -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
84166882d9
minimum boost version is 1.47 - remove obsolete code handling older versions
2014-01-27 13:19:21 -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
d82d9d382f
fix compile with BOOST_SPIRIT_NO_PREDEFINED_TERMINALS
2014-01-26 16:06:32 -08:00
Dane Springmeyer
63ea37b4c2
further no terminal port
2014-01-26 14:49:03 -08:00
Dane Springmeyer
49aadae244
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
...
Conflicts:
tests/visual_tests/test.py
2014-01-17 20:04:09 -08:00
Dane Springmeyer
77da5d919c
further gdal nodata handling improvements - refs #2023
...
Conflicts:
plugins/input/gdal/gdal_featureset.cpp
2014-01-17 19:46:35 -08:00
Dane Springmeyer
8faf5511f1
further gdal nodata handling improvements - refs #2023
2014-01-17 19:13:53 -08:00
Dane Springmeyer
9550e98a62
Merge branch 'master' of github.com:mapnik/mapnik into expr-v2
2013-12-11 07:28:35 -08:00
Dane Springmeyer
b492437505
avoid dereferencing pointer more than once
2013-12-11 07:27:51 -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
e5bb5ed8aa
backport geojson parsing/generation fixes from master to 2.3.x - refs #2083
2013-11-21 14:11:47 -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
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
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
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
2d268d3a95
features_with_context: no need for default arg
2013-11-03 23:07:03 -08: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
7612ff7b20
csv plugin: support user defined extent
2013-10-30 11:57:03 -07:00
Dane Springmeyer
1f4160f0f0
topojson: built up knowledge of attributes and geometry type + tests
2013-10-29 00:37:41 -07:00
Dane Springmeyer
44fe776bf5
geojson plugin: simplify code
2013-10-29 00:34:42 -07:00
Dane Springmeyer
5d7012f32f
iwyu
2013-10-28 18:46:58 -07:00
Dane Springmeyer
b21b59b835
shape.input: conditionally include boost interprocess
2013-10-28 18:31:20 -07:00
artemp
24ce0f4b91
remove unused member variable
2013-10-23 17:44:04 +01:00
artemp
2f93188786
apply 116706fd1c fix - ref #2048
2013-10-23 15:26:43 +01:00
artemp
116706fd1c
remove index_array from datasource and implement move semantics in featureset
...
fixes #2048 for topojson.input
2013-10-23 15:01:29 +01:00
Dane Springmeyer
710d558218
scons: simplify linkflags/ldflags setting / attempt to fix #2025
2013-10-22 16:35:46 -04:00
Dane Springmeyer
afd23586f3
c++11 compile fixes
2013-10-22 16:05:44 -04:00
artemp
a1daefe467
fix index
2013-10-22 16:51:55 +01:00
artemp
7adee4ab36
c++11 : remove boost::make_shared includes
2013-10-17 15:09:56 +01:00
artemp
be56a61dea
+ input plugins: don't link to boost_thread
...
(python bindings still need boost_thread via thread_specific_ptr usage)
2013-10-11 15:17:32 +01:00
artemp
582ca02f44
remove unused boost.thread includes
2013-10-11 13:39:39 +01:00
artemp
3edfc69c81
== c++11
...
use std::tuple with std::get<>
2013-10-11 12:36:04 +01:00
artemp
c5763f07d6
== topojson
...
+ experimental simplification of arcs (boost::geometry::simplify - DP?)
2013-10-11 12:34:15 +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
0febcd76ba
+ pipe-style range adaptors for readability
2013-10-07 11:23:45 +01:00
artemp
b0edff4d11
+ skip repeated verticies
2013-10-07 11:14:50 +01:00
artemp
352b8994fc
+ optimize polygon generation (pre-alloc std::vector)
2013-10-07 10:52:19 +01:00
artemp
e3f18717d3
== topojson ==
...
support multi geometries
2013-10-04 15:40:06 +01:00
artemp
56a14368bf
cleanup usage
2013-10-03 17:16:21 +01:00
artemp
56174edaa8
== topjson ==
...
+ extract and transcode property values
2013-10-03 17:12:33 +01:00
artemp
11fabe0fcb
== topojson ==
...
+ use boost::variant<> for storing properties
+ parse properties as top level key/value pairs
2013-10-03 15:40:36 +01:00
artemp
ac8ececf1c
== topojson ==
...
+ use boost::variant<> for storing properties
+ parse properties as top level key/value pairs
2013-10-03 15:32:07 +01:00
artemp
48e65feb62
== topojson ==
...
+ polygon generator
2013-10-02 15:14:27 +01:00
artemp
81159bc006
oops -> don't copy topology object
2013-10-01 19:18:05 +01:00
artemp
bfcf356b84
topojson
...
+ populate r-tree index
2013-10-01 17:22:41 +01:00
Dane Springmeyer
c34c8a568f
merge with branch 2.3.x
2013-09-30 13:33:28 -07:00
artemp
ae3f682564
add missin copyright notice
2013-09-30 13:32:30 -07:00
Dane Springmeyer
a6ad3e6627
+ avoid copying feature_ptr during r-tree initialisation + avoid taking reference to temporary
2013-09-30 13:23:38 -07:00
artemp
fddec700ad
TopoJSON input plugin
...
skeleton implementation
2013-09-30 14:14:58 +01:00
artemp
ff93a8117b
add missin copyright notice
2013-09-30 13:32:24 +01:00
artemp
b3948e4a9c
+ avoid copying feature_ptr during r-tree initialisation
2013-09-30 11:36:04 +01:00
Dane Springmeyer
0f4ba4dfd5
sync with 2.3.x branch
2013-09-25 20:04:31 -07:00
Dane Springmeyer
226e5b2d7a
no need to set 'value' attribute on rasters except for point query
2013-09-25 15:24:08 -07:00
Dane Springmeyer
df3a455e19
refactor nodata related code dropping support for user-overide nodata where it does not make sense - refs #2023
2013-09-25 14:37:21 -07:00
Dane Springmeyer
681f8853d3
pull in changes from master
2013-09-24 22:57:01 -07:00
Dane Springmeyer
e8b00ab8a9
minor c++ style fixes
2013-09-23 17:37:46 -07:00
Dane Springmeyer
01344baffb
maintain default of max_size=10 and improve error output in the case max_size < max_async_connections
2013-09-23 17:32:42 -07:00
Dane Springmeyer
dc1d568501
code cleanup, consistent debug output
2013-09-23 14:57:23 -07:00
artemp
e2f5e35616
+ opps, 'auto' is c++11
2013-09-20 17:19:23 +01:00
artemp
0eada70845
+ use const std::unique_ptr< []> instead of boost::scoped_array
2013-09-20 15:01:58 +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
Dane Springmeyer
5c77edcc5e
remove uneeded usage of std::move
2013-09-18 20:24:51 -07:00
Dane Springmeyer
111bdccebc
various post-merge fixes
2013-09-18 19:51:14 -07:00
artemp
95026329ce
+ fix err message typo
2013-09-16 10:40:48 +01:00
artemp
ac8a0f01eb
c++ style : std::map
2013-09-16 10:39:52 +01:00
artemp
23b1948c6e
+ minor tweaks
2013-09-16 10:03:54 +01:00
David Marteau
7495d2f381
[mappy] Parallel feature requests supports - PostGIS async requests
2013-09-11 14:04:10 +02: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
72c019f1c3
wrap section of gdal plugin only needed for debug output
2013-08-19 22:30:23 -04: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
4eef244e73
move SHAPE_MEMORY_MAPPED_FILE to be a global define
2013-08-13 14:48: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
Dane Springmeyer
d2000b465b
Merge branch 'master' of github.com:mapnik/mapnik
2013-08-13 12:19:19 -04:00
Dane Springmeyer
28ed9a2cfd
only include mapped_memory_cache.hpp if truly building shapefile plugin with -DSHAPE_MEMORY_MAPPED_FILE
2013-08-13 12:19:01 -04:00
Dane Springmeyer
e32c225307
fix handling of F and O type dbf fields and sync handling for attribute_descriptors - refs #1614 and closes #1976
2013-08-07 18:58:01 -04:00
Dane Springmeyer
4fb2e271f6
Revert "as discussed with @artemp - there should be no need or benefit to trying to handle F type in dbf since it is a foxpro extension that shapefiles do not commonly use"
...
This reverts commit 53acae94be
2013-08-07 18:42:16 -04:00
Dane Springmeyer
31931b89cb
git rid of a few fixme
2013-07-23 16:00:16 -04:00
Dane Springmeyer
032e33cc9f
remove filter_factor as option to gdal datasource, clean up pass down from query object - closes #1488 - refs #625
2013-07-19 19:22:45 -04:00
Dane Springmeyer
75ca01889c
scons: only hardcode static linking libs on os x
2013-07-14 15:17:00 -04: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
3792c1f319
sqlite: add more debug output
2013-07-03 10:54:42 -04:00
Dane Springmeyer
18ab68f03f
iwyu
2013-06-21 12:00:48 -07:00
Dane Springmeyer
b40128706c
scons: default to building csv/geojson plugins unless boost is known to be too old (fixes HOST behavior)
2013-06-14 11:41:52 -07:00
Dane Springmeyer
60b4f42891
sqlite: return char* not void *
2013-06-06 13:11:18 -07:00
Dane Springmeyer
a21f883c5c
fix linking of gdal/ogr plugins when linking to statically built gdal
2013-06-03 13:43:49 -07:00
Dane Springmeyer
19ce56b051
one more special case handling of utf8 in ogr plugin - refs #1177
2013-06-02 21:09:21 -07:00
Dane Springmeyer
3b2bdba7b0
iwyu
2013-06-02 20:19:33 -07:00
Dane Springmeyer
8c04925fce
cleanup after 0365d3e081
2013-06-02 20:13:24 -07:00
Dane Springmeyer
0365d3e081
start centralizing filesystem operations in mapnik::util::fs - refs #1177
2013-06-02 19:28:24 -07:00
Dane Springmeyer
ef1b99532b
scons: fix boost_regex and sqlite_rtree config checks and be resilient to plugins that cannot be built due to the boost version
2013-06-02 14:56:21 -07:00
Dane Springmeyer
0e273486c6
support base parameter in geojson plugin and throw if file cannot be opened
2013-06-02 12:12:03 -07:00
Dane Springmeyer
56b1e7cd64
fix cxxflags append in ogr input build
2013-06-02 11:51:09 -07:00
Dane Springmeyer
370609feed
shape.input: when reading from mapped memory cache keep a mapped_region_ptr member to ensure the memory stays alive - refs #1877
2013-05-30 14:32:20 -07:00
Dane Springmeyer
bf7e353304
python.input: workaround broken box2d python->c++ conversion on osx/clang - closes #1876
2013-05-30 09:18:25 -07:00
Dane Springmeyer
7302b3b654
fix #1865
2013-05-24 16:45:02 -07:00
Dane Springmeyer
9f4bde3078
fix unsigned/signed comparision warning
2013-05-22 13:16:12 -07:00
artemp
653e9e73b4
+ implement features_at_point in term of existing features(query)
2013-05-22 16:40:26 +01:00
artemp
a3eaebd5e1
feature_at_point
...
+ use 'tol' where possible
2013-05-22 16:40:26 +01:00
Dane Springmeyer
337410fc98
remove tabs
2013-05-21 12:56:35 -07:00
Dane Springmeyer
8478fdc217
fix boolean check to be easier to read
2013-05-21 12:55:08 -07:00
Dane Springmeyer
49933d7d0f
remove tab
2013-05-21 12:54:48 -07:00
Dane Springmeyer
20076e593f
support for handling unicode paths on windows in sqlite, csv, and geojson plugins - refs #1177
2013-05-21 12:51:31 -07:00
artem@windows
154c93017a
* add support for unicode (utf16) paths on windows
2013-05-21 09:42:55 -07:00
artem@windows
871ac5b4bb
* add support for unicode (utf16) paths on windows
2013-05-21 09:48:12 +01:00
artemp
f2132fa7bb
+ use tol in feature_at_point
2013-05-20 14:00:02 +01:00
artemp
551e9e427e
+ use tol in feature_at_point
2013-05-17 16:24:32 +01:00
artemp
57d5da9004
+ fix sqlite.input build
2013-05-17 16:23:36 +01:00
artemp
9686999a2c
fix sqlite build
2013-05-17 13:13:18 +01: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
499f8aefc5
+ fix accidental typo :)
2013-05-15 15:13:19 +01:00
artemp
682b85b27d
+ fix accidental typo :)
2013-05-15 15:12:28 +01:00
artemp
c698079f5e
+ log Null geometry case ( via @TomH )
2013-05-15 15:09:53 +01:00
artemp
99dcc76860
+ log Null geometry case ( via @TomH )
2013-05-15 15:07:17 +01:00
artemp
06e4105310
+ check if geometry record (WKB) is not Null before attempting to parse
2013-05-15 14:39:24 +01:00
artemp
4dd1189ac8
+ check if geometry record (WKB) is not Null before attempting to parse
2013-05-15 14:38:54 +01:00
artemp
86aeee1ea1
+ remove an empty line at the begining
2013-05-15 14:31:57 +01:00
Dane Springmeyer
1b95518ce1
remove kismet plugin - closes #1833
2013-05-09 17:29:03 -07:00
artemp
4915bf138e
mapnik::value + add move ctor
...
mapnik::feature + pass attributes by r-value.
2013-05-07 12:04:06 +01:00
artemp
31a506f3cb
+ use more consise c++11 syntax
2013-05-06 15:52:04 +01:00
Toby Collett
ac09541243
Use shared pointer reference count to track pools
...
By using the shared pointer reference count to track the connections
in the connection pool we no longer have to explicitly return them
to the pool.
This resolves an issue where cursor feature sets were returning their
connections before they were done with them, causing a potential race
with another connection user.
2013-04-29 20:33:57 +00:00
artemp
58927b404c
c++11
...
+ replace BOOST_FOREACH with for( : )
+ remove boost/foreach.hpp
+ fix benchmarks (17,18)
2013-04-24 16:40:35 +01:00
artemp
ea28abf203
Merge branch 'master' into image-readers-c++11
...
Conflicts:
bindings/python/mapnik_image.cpp
include/mapnik/factory.hpp
include/mapnik/image_reader.hpp
src/image_reader.cpp
src/jpeg_reader.cpp
src/png_reader.cpp
2013-04-22 12:24:09 +01:00
Dane Springmeyer
4c38bf9b81
remove geos plugin (moved to https://github.com/mapnik/non-core-plugins ) - refs #1809
2013-04-19 14:09:25 -07:00
artemp
c73e48fa58
+ use std::unique_ptr instead of std::auto_ptr (deprecated!)
2013-04-19 09:50:50 +01:00
Dane Springmeyer
83eb8f2595
fix handling of null values for feature id in sqlite/postgis input - closes #1817
2013-04-17 15:34:21 -07:00
Dane Springmeyer
60c6592c4e
fix spelling of unknown
2013-04-17 14:23:04 -07:00
Dane Springmeyer
9da1f35b5e
plugins do not need to store nulls / save space - refs #1644
2013-04-11 16:05:29 -07:00
artemp
bfaee4afae
+ avoid std::string->C-string->std::string round trip
2013-04-10 12:44:05 +01:00
artemp
48fa520a83
+ figure out raster format from file name unless explicitely specified by
...
'format' parameter.
2013-04-10 12:16:19 +01:00
kunitoki
206a563e0c
- better usage of mapnik::singleton instance in occi datasource
...
- occi small cosmetics
2013-04-08 15:18:48 +02:00
kunitoki
40c01fd0ed
- move occi object creation in the environment
2013-04-08 11:36:22 +02:00
kunitoki
ca9af53829
- keep seeking for valid geometries in oracle featureset (much like postgis featureset)
2013-04-02 09:33:56 +02:00
Artem Pavlenko
a20cf31c01
Merge pull request #1764 from strk/master_connection_leaks
...
Fix postgresql connection leaks
2013-03-28 05:49:24 -07:00
kunitoki
26ba946cb0
- avoid using clog/cerr in sqlite plugin (use mapnik::logging facilities instead)
2013-03-27 09:02:40 +01:00
Dane Springmeyer
f2ee8cae16
avoid signed/unsigned warning with llvm-g++
2013-03-19 14:01:48 -07:00
Sandro Santilli
0c5d5ca99c
Fix postgresql connection leaks
...
Return connection to pool on connection error (see #1708 )
Fix leaks on persist_connection=false (#1711 )
Includes testcase for #1711
2013-03-15 10:34:22 +01:00
artemp
8d3061076d
+ make operator=() non-throw
...
+ use std::swap()
2013-03-14 09:35:41 +00:00
artemp
31bcb8507b
+ poss args by const ref
2013-03-14 09:35:41 +00:00
Dane Springmeyer
e2c7283522
Added new mapnik-config options: git-describe, defines, includes, dep-includes, and cxxflags - closes #1443
2013-03-13 19:49:59 -07:00
Dane Springmeyer
541e1b7ba2
round floating point to int - refs #1672
2013-03-13 12:19:10 -07:00
Dane Springmeyer
9c7b155b1d
add the python libpath to ensure proper linking
2013-03-12 18:43:58 -07:00
Dane Springmeyer
d70cf153cc
fix compile of rasterlite plugin
2013-03-12 18:36:03 -07:00
Dane Springmeyer
5b3cca9d44
remove used variables
2013-03-11 12:59:11 -07:00
Dane Springmeyer
84706d22a5
fix linking of python.input to python lib on linux
2013-03-06 14:02:38 -08:00
kunitoki
c7139a55a7
- actually we don't want a shared_ptr as the resultset could be handled in a pool
2013-03-06 13:27:00 +01:00
kunitoki
ad6fe5ae55
- avoid a segmentation fault when an error occurred in oracle sql query
2013-03-06 12:48:34 +01:00
artemp
e9f03a565f
+ explicit polygon path closing
2013-03-01 11:08:58 -05:00
Dane Springmeyer
054cb13231
Merge branch 'master' of github.com:mapnik/mapnik
2013-02-26 12:07:53 -05:00
Dane Springmeyer
d861636fbc
move const char string2value interface to use iterators
2013-02-26 12:07:36 -05:00
kunitoki
5abd52b25f
- partially reverted occi changes: oracle Number datatype should really be interpreted as double (not integer or string)
2013-02-26 17:41:14 +01:00
Dane Springmeyer
712ff50abe
make a few utility functions inline and static
2013-02-26 10:52:41 -05:00
kunitoki
5d8b9ba4fc
- improved oracle sub-select handling
...
- fixed a logic problem of the rowlimit clause (when using seb-selects)
- applied tokens to the query (much like the postgis datasource)
- leave oracle to convert most datatypes (should fix occi part of ref #1672 )
2013-02-25 11:31:18 +01:00
kunitoki
8b61efa333
- improved type conversions in oracle plugin (especially date/time columns now can be filtered in styles)
2013-02-19 11:54:15 +01:00
Dane Springmeyer
ae5f4d26d1
tests: make consistent the proj4 string for epsg:4326
2013-01-25 00:49:55 -08:00
Dane Springmeyer
d6587d791d
avoid aign conversion compiler warnings
2013-01-21 14:13:24 -08:00
artemp
1ef9ec2b88
+ use std::deque for caching features.
2013-01-18 12:27:29 +00:00
Dane Springmeyer
e16567fecb
fixup std:: prefixing of cmath functions - closes #1694
2013-01-17 13:53:48 -08: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
ceb8ffcc6f
fixup includes for shape input
2013-01-14 01:49:35 -08:00
Dane Springmeyer
2c28219e4c
add back depedence of hello world plugin on libmapnik accidentally removed in refactoring in 3e67c1d694
2013-01-13 22:16:43 -08:00
Dane Springmeyer
071c67d438
iwyu
2013-01-13 22:01:13 -08:00
Dane Springmeyer
0e8d224ecb
remove uneeded usage of boost::lexical_cast - refs #1687
2013-01-11 11:11:20 -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
e682705a86
use the std library tolower over boost::algorithm::to_lower for both better runtime and compile speed - closes #1677
2013-01-03 19:27:53 -08:00
Dane Springmeyer
e7f608c2fa
fix -Wshadow warning in geojson plugin
2013-01-03 18:53:22 -08:00
Dane Springmeyer
4471c0f6f4
fixup includes
2013-01-03 18:53:00 -08:00
Dane Springmeyer
626e0056fd
replace boost::trim with faster internal trim - refs #1633
2013-01-03 18:02:21 -08:00
Dane Springmeyer
58d53dbe2f
avoid -Wshadow warning
2013-01-03 18:01:36 -08:00
Dane Springmeyer
9183ca3d61
remove uneeded semicolon
2013-01-03 18:00:49 -08:00
Dane Springmeyer
771e2f3d8e
fix -Wshadow warning
2013-01-03 18:00:28 -08:00
Dane Springmeyer
ebfc3161c1
avoid direct usage of spirit in csv plugin
2013-01-03 16:26:09 -08:00
Dane Springmeyer
a5fdcea9db
remove unused and obsolete 'quiet' option from csv datasource
2013-01-03 14:49:22 -08:00
Dane Springmeyer
000b714eae
fix more clang++ -Wshadow warnings
2013-01-03 12:37:45 -08:00
artemp
bba0b61dfc
+ consider metadata first when calculating extent
2013-01-03 15:44:05 +00: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
e52879d623
ensure plugin is only built after libmapnik
2012-12-26 16:52:24 -08:00
Dane Springmeyer
a4b07553ae
store copy of bbox on featureset to avoid the same potential bug as #1667 ( 9b3d2b7)
2012-12-21 20:02:03 -08:00
Dane Springmeyer
aee275a08c
fix number handling in csv plugin and add tests for 64bit integer support in sqlite and postgis datasources - refs #1669
2012-12-21 19:53:33 -08:00
Dane Springmeyer
9b3d2b7d8e
fix sqlite featureset results when non using an rtree index - closes #1667
2012-12-20 22:40:39 -08: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
fa1acc5de7
fix compile of occi plugin by casting from int to mapnik::value_integer (appears occi does not support 64 bit ints)
2012-12-19 10:38:37 -08:00
artemp
94bda55793
Merge branch 'master' into bigint
2012-12-18 21:50:30 +00:00
Dane Springmeyer
5758e6d9de
Loosen simplification factor to 1/20 of pixel (master branch) - closes #1639
2012-12-18 11:57:45 -08:00
artemp
f5dd9e53c4
+ calc int_parser/generator type from mapnik::value_integer
2012-12-18 18:05:45 +00:00
artemp
a38b252ccd
Merge branch 'master' into bigint
...
Conflicts:
plugins/input/geojson/geojson_datasource.cpp
plugins/input/postgis/postgis_featureset.cpp
2012-12-18 13:57:39 +00:00
artemp
274fbf8f7a
+ ensure 'close path' handled correcly
...
(currenlty SEG_CLOSE command must have valid x,y)
+ implement real_policies in wkt and geojson generators
2012-12-18 11:44:35 +00:00
Dane Springmeyer
43244efb7d
Merge branch 'master' of github.com:mapnik/mapnik into no-bind
2012-12-17 13:03:11 -08:00
Dane Springmeyer
7b39333234
remove as much mutable as possible
2012-12-17 12:59:15 -08:00
Dane Springmeyer
bdfdca99e9
fix debug output
2012-12-17 10:51:10 -08:00
Dane Springmeyer
c5410fac7e
remove bind option for datasources - refs #962
2012-12-17 10:03:07 -08:00
Dane Springmeyer
bb27156df0
use internal noncopyable class to speed up compile times slightly
2012-12-16 18:19:52 -08:00
artemp
c4bae9d30a
Merge branch 'master' into bigint
...
Conflicts:
bindings/python/mapnik_feature.cpp
plugins/input/shape/dbfile.cpp
2012-12-14 10:01:21 +00:00
Dane Springmeyer
772c7f52fc
knock out some msvc compiler warnings
2012-12-12 15:59:27 -08:00
Dane Springmeyer
3fd7909ba0
fix compile on windows with msvc 2010 - closes #1646
2012-12-12 15:09:07 -08:00
Dane Springmeyer
9575bb8786
return value_null for null integer stored in shapefile dbf - closes #1638 - refs #1642
2012-12-11 19:40:46 -08:00
Dane Springmeyer
e928c483bf
properly support tolerance in shape filter_at_point - refs #1640
2012-12-11 14:46:52 -08:00
Dane Springmeyer
53ba3483db
remove unused 'using' usage
2012-12-11 14:31:14 -08:00
artemp
02bb955b59
+ simplify and refactor shape featuresets to be more resilient to various
...
quirky shapefiles.
+ fix io navigation functions to use std::streampos
2012-12-11 09:37:53 +00:00
Dane Springmeyer
7c58bf9fcb
replace boost::trim with faster custom trim - closes #1633
2012-12-07 14:06:13 -08:00
Dane Springmeyer
c0021d0760
remove unused iostream includes and unnecessary usage of ostringstream - refs #1055
2012-12-06 23:06:12 -08:00
artemp
da0d74529d
+ fix record length check to account for OGR not writing PointZ according to
...
shapefile spec - PointZ: type,x,y,z,measure (#1193 , #504 )
2012-12-06 15:14:06 +00:00
artemp
8fa88a71b6
Merge branch 'master' into bigint
2012-12-03 13:14:31 +00:00
artemp
855aea95e0
+ mapnik::value and mapnik::parameters - initial support for 64-bit integers
2012-12-03 13:12:09 +00:00
Dane Springmeyer
e9ca5b47e2
finish support for dbf logical type, strip handling of memo, and add tests for all basic types - refs #1614
2012-12-02 21:37:39 -08:00
Dane Springmeyer
4e9f6c12eb
Merge branch 'master' of github.com:mapnik/mapnik
2012-11-29 17:53:06 -08:00
Dane Springmeyer
53acae94be
as discussed with @artemp - there should be no need or benefit to trying to handle F type in dbf since it is a foxpro extension that shapefiles do not commonly use
2012-11-29 17:44:06 -08:00
artemp
26889c4761
+ support 'logical' type #1614
2012-11-29 17:19:34 +00:00
artemp
85e00d6596
Merge remote-tracking branch 'origin/master'
2012-11-29 10:36:18 +00:00
artemp
430e75e0ac
+ better stdout
2012-11-29 10:35:03 +00:00
artemp
913e1d0cfe
+ don't expect we _must_ consume all input when parsing numbers
...
some DBF can have some junk appended to records #1605
2012-11-29 10:23:51 +00:00
Dane Springmeyer
8bfc330015
postgis: do not fatally throw if metadata queries fail - closes #1609 and closes #1565
2012-11-28 20:19:11 -08:00
Dane Springmeyer
0548d6037b
fix postgres null connection error adding space for better formatting
2012-11-28 18:20:34 -08:00
Dane Springmeyer
1baeb7036c
cleanup unused code
2012-11-28 18:20:09 -08:00
Dane Springmeyer
2ee6c9aca1
Merge branch 'master' of github.com:mapnik/mapnik
2012-11-28 17:48:14 -08:00
Dane Springmeyer
46ee60b398
fix row_limit behavior in shape.input to stop reading when count = row_limit, not just when count > row_limit
2012-11-28 14:15:53 -08:00
artemp
cff52c9f73
+ fix typo
2012-11-28 19:16:10 +00:00
artemp
99141fa5e5
+ support initialSize_ updates
...
+ move maxSize_/initialSize_ logic into pool.hpp
2012-11-28 17:38:18 +00:00
artemp
a3fe851737
+ overwrite pool::maxSize_ with max value
2012-11-28 17:04:53 +00:00
Dane Springmeyer
9afaf091b1
postgis plugin: avoid printing the password if connection fails - amends 19deb86591
2012-11-27 18:37:22 -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
artemp
cec34dd5a6
+ better error msg
2012-11-27 12:49:19 +00:00
artemp
b114e8219c
+ add status() method to reduce code duplication
2012-11-27 12:48:22 +00:00
artemp
85192afe2b
+ avoid creating duplicate attributes
2012-10-26 12:15:31 +01:00
Dane Springmeyer
28c35055e4
fix null feature handling in ogr input - closes #1542
2012-10-20 20:16:17 -07:00
Dane Springmeyer
bc4a74f5b0
python plugin: catch and report exceptions, closes #1422
2012-10-19 17:05:51 -07: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
Dane Springmeyer
baa2880dad
nicer error formatting of ogr layer names
2012-10-09 13:47:24 -07:00
Dane Springmeyer
65b19680e0
followup to 69fb17cd3c - make sure to report literal in descriptor
2012-10-05 14:49:12 -07:00
Dane Springmeyer
8b73d8527f
ogr.input: continue past null features or geometries rather than aborting rendering
2012-10-05 13:49:29 -07:00
Dane Springmeyer
7efb37adb7
formatting
2012-10-04 17:59:43 -07:00
artemp
10a28145b4
+ sqlite: load extension
2012-10-04 12:36:07 +01:00
Dane Springmeyer
c27530ec7b
remove inefficient and no longer used mapnik::raster constructor - refs #1516
2012-10-03 18:22:18 -07:00
Dane Springmeyer
4bc6b0c800
avoid copy of image data by using new, more efficient mapnik::raster constructor - closes #1516
2012-10-03 15:53:41 -07:00
Dane Springmeyer
86e805b33e
Merge pull request #1499 from manelclos/master
...
Query tolerance for features_at_point
2012-10-03 11:50:29 -07:00
Dane Springmeyer
0b9ebe21dd
use boost make_shared
2012-10-02 14:12:15 -07:00
artemp
037c1a84c6
+ use format_
2012-10-01 15:46:03 +01:00
artemp
3ffe8ec21c
+ add premultiplied_alpha flag to mapnik::raster
2012-09-28 16:43:05 +01: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
Dane Springmeyer
083ff236b7
Revert "+ fix parameters names to be more css-ish"
...
This reverts commit 5c5c4fb76e
2012-09-26 11:57:29 -07:00
Dane Springmeyer
d6821e8ce9
Merge branch 'master' of github.com:mapnik/mapnik
2012-09-25 14:33:54 -07:00
Dane Springmeyer
e8abc8eef1
csv: stop adding WKT/JSON geometry data to attributes
2012-09-25 14:08:07 -07:00
artemp
ae176d1d19
+ use 'extent' for both raster.input and gdal.input
2012-09-24 17:12:03 +01:00
artemp
5c5c4fb76e
+ fix parameters names to be more css-ish
2012-09-24 16:14:17 +01:00
artemp
ac735e82c2
+ make tile_size configurable for 'tiled' read policy
2012-09-24 13:39:03 +01:00
Dane Springmeyer
fca564614f
csv plugin: improve newline detection - closes #1497
2012-09-21 13:34:43 -07:00
Dane Springmeyer
9b5189abf0
sqlite: improve the error when no key_field is set and the primary key cannot be autodetected
2012-09-14 16:10:51 -07:00
artemp
967d6110bf
+ singleton: return ref from instance() method
2012-09-07 16:23:03 +01:00
artemp
11e6ba0c09
+ make client methods non-static in classes derived from
...
mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
2012-09-07 14:56:30 +01:00
artemp
69fb17cd3c
+ port 170e23440f to master
2012-09-05 10:58:21 +01:00
Dane Springmeyer
59129a7a2b
rename variable to avoid confusion with text_size
2012-09-04 14:35:03 -07:00
Dane Springmeyer
a12b8f1d2f
c++ style
2012-09-03 10:27:48 -07:00
Dane Springmeyer
f5cf5aa09d
start reporting geometry type in geojson plugin
2012-09-03 10:01:01 -07:00
Dane Springmeyer
f334085079
remove duplicate include
2012-09-03 09:59:58 -07:00
Dane Springmeyer
affecb0f32
csv plugin: support single row data and fix warning when no data can be parsed
2012-08-31 12:07:35 -07:00
Dane Springmeyer
2e44e8c470
postgis: do not attempt to parse an empty extent string
2012-08-30 15:04:05 -07:00
Dane Springmeyer
9a51b31e01
postgis: only warn for non-geometry type attributes
2012-08-28 16:23:09 -07:00
Dane Springmeyer
ac418a7d4e
remote the last references
2012-08-27 16:43:40 -07:00
Dane Springmeyer
d9fa1cb0c2
remove old $ cruft
2012-08-24 13:49:28 -07:00
Dane Springmeyer
4e2d2c67b0
double csv parsing speeds when handling geojson encoded geometries - refs #1436
2012-08-23 09:30:51 -07:00
Dane Springmeyer
a3254965fe
double csv parsing speeds when handling wkt encoded geometries - refs #1436
2012-08-23 09:07:06 -07:00
Dane Springmeyer
b81f8f0ee8
link the python plugin to libpython by default
2012-08-22 10:39:49 -07:00
Dane Springmeyer
bfc6a08b2e
csv: initialize variables to prevent gcc warnings - refs #1330
2012-08-22 09:54:27 -07:00
Dane Springmeyer
9f7e033dbc
csv plugin: be more permissive when headers length > column length but more strict when the opposite is true - closes #1417
2012-08-20 14:06:07 -07:00
Dane Springmeyer
f42805a532
CSV plugin: support reading geojson encoded geometries in various flavors of quoting fun - closes #1392
2012-08-17 13:46:32 -07:00
Dane Springmeyer
aee29b27ed
only build geojson plugin if >= boost 1.47 is available to avoid potential compiler errors with missing boost/geometry headers if people try to force older boost versions
2012-08-17 08:57:49 -07:00
Dane Springmeyer
cf3bbb8cf0
csv plugin: be more aggressive about detecting and ignoring blank lines
2012-08-16 18:20:48 -07:00
Dane Springmeyer
a986aedd05
remove 'info' and 'fatal' severities for logging to simplify framework - closes #1400
2012-08-16 15:52:32 -07:00
Dane Springmeyer
d902de1c08
remove unused member variables
2012-08-16 14:05:55 -07:00
Dane Springmeyer
d850ee8b76
correct various old trac links to point to github - closes #1396
2012-08-16 12:27:58 -07:00
Dane Springmeyer
107c72563f
avoid some msvc compiler warnings in gdal input- refs #1103
2012-08-15 12:37:17 -07:00
artemp
5f2c2d1a37
+ c++ style
2012-08-09 12:41:35 +01:00
Dane Springmeyer
cc1ddc3015
simplify linking logic in python plugin fixing os x install (where we do not want to link the plugin explicitly to python)
2012-08-06 06:32:41 -06:00
Artem Pavlenko
189322ef9f
Merge pull request #1337 from rjw57/rjw57-python-plugin
...
Request for comments: python: a new plugin to use arbitrary Python as a data source
2012-08-06 05:09:29 -07:00
Hermann Kraus
42e31faaf5
Reindent code.
2012-08-05 15:35:43 +02:00
Hermann Kraus
e437ae7aeb
Fix crash while processing empty ways in OSM data (e.g. deleted ways).
2012-08-05 15:34:22 +02:00
Rich Wareham
16ffdf1fb5
python plugin: remove useless Makefile
2012-07-31 17:07:11 +01:00
Rich Wareham
156a7590f4
python: a new plugin to use arbitrary Python as a data source
...
This plugin allows you to write data sources in the Python programming language.
This is useful if you want to rapidly prototype a plugin, perform some custom
manipulation on data or if you want to bind mapnik to a datasource which is most
conveniently accessed through Python.
The plugin may be used from the existing mapnik Python bindings or it can embed
the Python interpreter directly allowing it to be used from C++, XML or even
JavaScript.
Mapnik already has excellent Python bindings but they only directly support
calling *into* mapnik *from* Python. This forces mapnik and its input plugins to
be the lowest layer of the stack. The role of this plugin is to allow mapnik to
call *into* Python itself. This allows mapnik to sit as rendering middleware
between a custom Python frontend and a custom Python datasource. This increases
the utility of mapnik as a component in a larger system.
There already exists MemoryDatasource which can be used to dynamically create
geometry in Python. It suffers from the problem that it does not allow
generating only the geometry which is seen by a particular query. Similarly the
entire geometry must exist in memory before rendering can progress. By using a
custom iterator object or by using generator expressions this plugin allows
geometry to be created on demand and to be destroyed after use. This can have a
great impact on memory efficiency. Since geometry is generated on-demand as
rendering progresses there can be arbitrarily complex 'cleverness' optimising
the geometry generated for a particular query. Obvious examples of this would
be generating only geometry within the query bounding box and generating
geometry with an appropriate level of detail for the output resolution.
2012-07-31 17:05:27 +01:00
artemp
03422de504
+ close polygons (SEG_CLOSE)
2012-07-26 15:51:10 +01:00
artemp
618bc1ba0f
+ close polygon
2012-07-26 15:20:23 +01:00
artemp
4ddddba254
+ use pre-increment op
2012-07-26 11:58:48 +01:00
artemp
690b56a511
+ use std::auto_ptr
2012-07-26 11:57:41 +01:00
Dane Springmeyer
4ad15db23d
collect attribute descriptions in geojson plugin (TODO: sorting of attributes is returned in reverse order)
2012-07-25 16:11:51 -07:00
Dane Springmeyer
6df998cf39
fixup various plugin includes
2012-07-25 09:29:21 -07:00
Dane Springmeyer
241bf28da0
'include what you use' in plugins to set up for future forward declarations in mapnik/feature.hpp and mapnik/datasource.hpp
2012-07-24 19:21:55 -07:00
Dane Springmeyer
1b23838c58
avoid uninitialized compiler warning
2012-07-23 17:43:21 -07:00
Dane Springmeyer
5c20a9f72a
suppress unused variable compiler warnings with gcc
2012-07-23 17:29:10 -07:00
Dane Springmeyer
a1d6579da2
silence a few compiler warnings
2012-07-23 17:21:29 -07:00
Dane Springmeyer
0e7414ea1d
ogr plugin: no need to pass dataset pointer
2012-07-20 19:01:09 -07:00
Dane Springmeyer
669c4906d4
avoid c-linkage warning with datasources - closes #1323
2012-07-20 18:34:41 -07:00
Dane Springmeyer
e36081a5c0
change geometry_utils::from_wkb to return a bool that signifies if at least one wkb path was parsed - refs #1333 and #1305
2012-07-20 15:09:01 -07:00
Dane Springmeyer
15a624fa79
update readmes for template plugins
2012-07-10 14:54:05 -07:00
Dane Springmeyer
d3b375713b
properly populate the context
2012-07-10 14:51:13 -07:00
Dane Springmeyer
86f137fd25
recompile stale targets during deploy
2012-07-10 14:50:43 -07:00
Dane Springmeyer
c227ea8b5f
add sample Makefile for local dev
2012-07-10 14:46:00 -07:00
Dane Springmeyer
f79fd4634e
make markdown files
2012-07-10 14:28:52 -07:00
artemp
700b5978d8
+ check bounding box intersections if use_spatial_index=false ( #971 )
2012-07-02 18:15:18 +01:00
Dane Springmeyer
37c9142515
csv plugin: also detect fields named 'lng' as longitude
2012-06-25 10:18:09 -07:00
Dane Springmeyer
39bae3825e
remove plugin usage of lexical cast - refs #1055
2012-06-22 16:49:53 -04:00
Artem Pavlenko
8d4534de78
+ remove debug print
2012-06-14 15:10:32 +01:00
Artem Pavlenko
ddfe15025b
+ use rtree index
2012-06-14 14:41:15 +01:00
Artem Pavlenko
e89eb99e28
+ geojson input plugin (thanks, @tmcw!)
2012-06-13 13:30:58 +01:00
Sandro Santilli
ceffa76bdc
Provide !pixel_width! and !pixel_height! tokens ( #1181 )
2012-04-24 12:56:07 +02:00
kunitoki
47b6f8e454
- avoid parsing parameters in features() (postgis new simplify geometries)
...
- renamed simplify to simplify_geometries
2012-04-19 22:05:57 +02:00
Sandro Santilli
f7c5e69315
PostGIS vectors reduction, XML parameter driven ( #1136 )
2012-04-17 17:03:20 +02:00
Dane Springmeyer
74d4f84787
formatting
2012-04-16 22:23:05 -07:00
Dane Springmeyer
e21bcb35a1
whitespace
2012-04-16 22:22:35 -07:00
Dane Springmeyer
e947d7eac9
ogr: fix reading of geometry type for datasources like geojson that need to read first feature to detect the type propertly
2012-04-12 13:04:59 -07:00
kunitoki
46d45e8496
- decrease the default number of connection in oracle pool
2012-04-10 15:53:58 +02:00
kunitoki
8f36d47a13
- fixed a potential buffer overflow in geos plugin error reporting
...
- updated changelog for new logging system
2012-04-10 10:24:53 +02:00
Dane Springmeyer
bfb0f22788
fix compile of geos datasource
2012-04-09 17:19:03 -07:00
kunitoki
a902a08aab
- added logging to file
...
- started working on the logger bindings
- cleanups some error reporting with cerr/clog in the library
2012-04-10 00:25:31 +02:00
kunitoki
b60c508c1c
- finish thrashing all the useless ifdef MAPNIK_LOG
2012-04-09 21:41:56 +02:00
kunitoki
74342e3083
- no need to #ifdef all the time: the compiler should optimize out the log calls when no MAPNIK_LOG is defined
...
- initially got rid of those ifdefs in plugins only
2012-04-09 12:05:49 +02:00
kunitoki
8c58a9aa73
- improved again the logging facilities
...
- aligned the plugins to using the new methods with severity
- implemented per object severity, with fallback to global (with global functions to set them programmatically)
- initial check in of logger python bindings (todo)
2012-04-09 03:00:51 +02:00
Dane Springmeyer
31303ff341
shape plugin: only add feature value if parsing is successful
2012-04-07 17:56:58 -07:00
kunitoki
af201551b8
got rid of old CVS $Id comments kludge in files
2012-04-08 02:45:01 +02:00
kunitoki
1f351e0e09
implement new debug system
2012-04-08 02:20:56 +02:00
Dane Springmeyer
b21d8a9957
avoid copy
2012-04-06 14:29:13 -07:00
Dane Springmeyer
b7f714f7ec
postgis: primary key autodetection will now only happen if 'autodetect_key_field' is set to true - maintains current behavior - refs #804
2012-04-05 11:05:14 -07:00
Dane Springmeyer
c88fcc8f04
revert unintended change to sqlite in a7e150a593
2012-04-03 16:33:06 -07:00
Dane Springmeyer
46b16c917e
support nodata for paletted images and allow user to set nodata on-the-fly - closes #1160 and #1161 - refs #688 and refs #730 and refs #50 and refs #1018
2012-04-03 16:06:36 -07:00
Dane Springmeyer
a7e150a593
tests: add simple tests for postgis 'bbox' token replacement
2012-04-02 19:29:06 -07:00
Dane Springmeyer
253a1e4b4b
occi: fix invalid concatenation uncovered by latest clang++
2012-04-02 19:20:09 -07:00
Dane Springmeyer
10848f9d04
postgis: warn in the unlikely case of a numeric primary key
2012-04-02 18:13:27 -07:00
Dane Springmeyer
763e84a6e9
postgis: add support for auto-detection of primary key field - closes #804 - refs #753
2012-04-02 16:20:41 -07:00
Dane Springmeyer
f6a0f80f32
make note of need for 64bit int support in code comments for postgis plugin - refs #895
2012-04-02 15:42:52 -07:00
kunitoki
4a7966498c
- postgis resultset cosmetics
2012-03-31 22:24:32 +02:00
kunitoki
14bc344898
- cosmetics in postgis datasource
2012-03-28 22:10:48 +02:00
kunitoki
7dbe1279bf
- reorder constructor initialization list to avoid warnings in raster datasource
2012-03-28 22:01:45 +02:00
Artem Pavlenko
242385f16d
use mapnik::util namespace for conversions
2012-03-23 11:08:39 +00:00
Hermann Kraus
94634d4691
Correctly parse empty elements in OSM datasource.
2012-03-20 23:13:15 +01:00
Hermann Kraus
bd9fe739e5
Throw in OSM datasource if not all parameters are specified but bind is requested.
2012-03-20 23:13:15 +01:00
Dane Springmeyer
9556584b0c
create context in init list
2012-03-16 13:43:48 -07:00
Artem Pavlenko
385ca5b5b5
Merge remote-tracking branch 'origin/master'
2012-03-13 16:44:36 +00:00
Dane Springmeyer
b36739fd88
apply mapnik_format.el formatting
2012-03-13 07:59:22 -07:00
Artem Pavlenko
3f681a7504
+ move mapnik::context_ptr to initialization list
2012-03-13 10:19:46 +00:00
Artem Pavlenko
3891922b28
use const ref and avoid creating temp std::string
2012-03-13 10:11:58 +00:00
Hermann Kraus
2b68cea0a1
Merge branch 'new-xml'
...
Conflicts:
include/mapnik/config_error.hpp
include/mapnik/ptree_helpers.hpp
src/formatting/text.cpp
src/libxml2_loader.cpp
src/load_map.cpp
src/metawriter_factory.cpp
src/text_placements/registry.cpp
src/text_placements/simple.cpp
2012-03-13 11:11:28 +01:00
Hermann Kraus
c2f9e3b637
Include correct file in csv datasource.
2012-03-11 23:07:39 +01:00
Artem Pavlenko
302b7f1696
Revert "update rasterlite, occi, csv, hello_world, and rundemo"
...
This reverts commit ab7f6ee75c
2012-03-09 15:33:36 +00:00
Artem Pavlenko
254b3c9fa7
Merge branch 'master' into geometry-clipping
...
Conflicts:
SConstruct
include/mapnik/symbolizer_helpers.hpp
src/placement_finder.cpp
2012-03-09 14:18:41 +00:00
Dane Springmeyer
ab7f6ee75c
update rasterlite, occi, csv, hello_world, and rundemo
2012-03-09 12:58:16 +00:00
Hermann Kraus
c3cd50ff57
Complete new XML structure.
2012-03-07 19:16:41 +01:00
Dane Springmeyer
f90b410ece
formatting to use const& as per 6462af3
2012-03-05 11:10:04 -08:00
Dane Springmeyer
ab4c9da7ad
fixup ogr plugin error string output
2012-03-04 22:28:02 -08:00
Artem Pavlenko
c25e8c7d94
Merge remote-tracking branch 'origin/master'
2012-03-02 09:34:57 +00:00
Hermann Kraus
69824314ed
Simplify OSM plugin.
2012-03-02 01:01:13 +01:00
Hermann Kraus
9eec4eb1be
Fix OSM plugin.
2012-03-02 00:51:44 +01:00
Artem Pavlenko
726724b3c7
pass by ref
...
move conversions impl into .cpp
2012-03-01 18:36:13 +00:00
Dane Springmeyer
5bdaf44a7a
Revert "shape: check if multiple parts are interior rings or separate"
...
This reverts commit faaa4f6e3f
2012-02-26 22:11:22 -08:00
Dane Springmeyer
5a7de9c0db
remove uneeded default cases
2012-02-24 18:58:12 -08:00
Dane Springmeyer
74502b9d15
remove uneeded default cases
2012-02-24 18:56:58 -08:00
Dane Springmeyer
e4ce3d1929
cast to avoid msvc warning
2012-02-24 16:14:34 -08:00
Dane Springmeyer
524d6bea5f
avoid implicit cast from sqlite_int64 to int
2012-02-23 09:50:06 -08:00
Dane Springmeyer
4c4bfc8fc5
remove all usage of lexical_cast in postgis plugin - refs #1055
2012-02-21 11:03:33 -08:00
Dane Springmeyer
9be9b09d72
Merge branch 'master' of github.com:mapnik/mapnik
2012-02-16 17:44:34 -08:00
Artem Pavlenko
c83ab1d14e
Merge remote-tracking branch 'origin/master'
2012-02-15 19:20:17 +00:00
Artem Pavlenko
01497bfc36
+ add typedef size_type to mapnik::vertex_vector
...
+ remove set_capacity() method - no longer required
2012-02-15 15:16:33 +00:00
Dane Springmeyer
4ad9b4d282
formatting
2012-02-14 16:07:23 -08:00
Dane Springmeyer
1c07372a13
postgis: make sure to add key_field to feature context
2012-02-14 14:58:09 -08:00
Dane Springmeyer
6dfb3604a4
postgis: remove last usage of deprecated functions - fully supporting postgis 2.0 - closes #1083
2012-02-14 13:07:05 -08:00
Dane Springmeyer
e2d398f6db
add permissive flag to ogr and shape plugins to work around boost interprocess compile bug - closes #1082 - refs #950 and #1001
2012-02-14 10:33:40 -08:00
Dane Springmeyer
00a2bec062
silence signed/unsigned compiler warning
2012-02-13 11:01:58 -08:00
Dane Springmeyer
b866b6d51c
remove uneeded variables
2012-02-13 11:01:44 -08:00
Dane Springmeyer
c33d534b80
link to boost system
2012-02-09 16:00:39 -08:00
Dane Springmeyer
b44a63ac1f
link all remaining plugins to boost_system to avoid potential linking errors with boost-trunk (upcoming 1.49) - closes #1070
2012-02-09 16:00:11 -08:00
Dane Springmeyer
1e2897b28d
update rasterlite to new feature_impl
2012-02-02 09:00:02 -08:00
Dane Springmeyer
0e701dd899
initialize context in init list
2012-02-02 08:58:20 -08:00
Dane Springmeyer
77c58e487d
whitespace fixes
2012-02-01 17:37:35 -08:00
Dane Springmeyer
60f1dadcd8
add code comment
2012-02-01 16:17:59 -08:00
Dane Springmeyer
e4a11c0d07
use correct context type
2012-01-31 08:35:40 -08:00
Artem Pavlenko
79d44e1bf8
Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl
2012-01-24 14:39:13 +00:00
Artem Pavlenko
75024c3fa1
Merge branch 'master' into feature_impl
2012-01-24 12:48:19 +00:00
Artem Pavlenko
19deb86591
append connection string to connection error message
2012-01-24 12:36:33 +00:00
Dane Springmeyer
aa6da2dce9
collect context before featureset creation in sqlite
2012-01-23 23:51:31 -08:00
Dane Springmeyer
62cf7cb2fe
no need for collecting size in postgis plugin
2012-01-23 23:50:50 -08:00
Dane Springmeyer
c576291346
push value into context for gdal plugin
2012-01-23 23:50:24 -08:00
Artem Pavlenko
4f48cce42e
push column names into context_type
2012-01-23 08:39:22 +00:00
Artem Pavlenko
54941d2893
+ refactor attribute validating
...
+ fix context in feature_at_point
2012-01-20 12:29:17 -05:00
Artem Pavlenko
1f98e0ce4e
+ fix context init
...
+ cleanup
2012-01-20 11:07:29 -05:00
Artem Pavlenko
6d6f213c8f
Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl
2012-01-19 17:38:49 -05:00
Artem Pavlenko
7601095e24
move context's typedef inside to avoid poluting global namespace
2012-01-19 17:36:27 -05:00
Dane Springmeyer
9097ea0ceb
update sqlite and osm datasources to new feature impl
2012-01-19 16:34:33 -05:00
Dane Springmeyer
b7032316d4
update the ogr plugin to use new feature_impl
2012-01-19 12:55:07 -05:00
Artem Pavlenko
5ebe4d4ea3
+ fix name
2012-01-19 11:08:07 -05:00
Artem Pavlenko
a88186fef8
no need for boost::noncopyable in derived classes
2012-01-18 09:13:29 -05:00
Artem Pavlenko
e699ba17cb
Merge branch 'master' into feature_impl
2012-01-18 07:48:57 -05:00
Dane Springmeyer
425f20fb68
ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric
2012-01-17 18:43:01 -05:00
Dane Springmeyer
fb80de8dfe
ogr plugin: for geometry type inspection support older gdal/ogr versions - fixes compile on ubuntu oneiric
2012-01-17 18:43:01 -05:00
Artem Pavlenko
63a3399036
Merge branch 'feature_impl' of github.com:mapnik/mapnik into feature_impl
2012-01-17 17:58:34 -05:00
Artem Pavlenko
7f816eaeca
fix init order
2012-01-17 17:58:00 -05:00
Dane Springmeyer
820b9a2b25
merge master with feature_impl
2012-01-17 17:47:27 -05:00
Artem Pavlenko
436fc91c3e
Merge pull request #1021 from mapnik/geometry_type_descriptor
...
Add Geometry type descriptor
2012-01-17 11:31:24 -08:00
Artem Pavlenko
9407991be4
Merge pull request #1021 from mapnik/geometry_type_descriptor
...
Add Geometry type descriptor
2012-01-17 11:31:24 -08:00
Dane Springmeyer
e4c03f6a54
adapt occi, geos, and kismet plugins to new feature impl
2012-01-17 14:22:21 -05:00
Dane Springmeyer
f0e37a9fa1
update csv plugin to use new feature interface
2012-01-17 13:34:08 -05:00
Dane Springmeyer
e1ba3f723d
add issue # to code comments
2012-01-17 13:33:35 -05:00
Artem Pavlenko
50b5d06a48
Merge remote-tracking branch 'origin/feature_impl' into feature_impl
...
Conflicts:
include/mapnik/feature.hpp
2012-01-17 12:39:16 -05:00
Artem Pavlenko
ab69053daa
Merge branch 'master' into feature_impl
2012-01-17 10:37:47 -05:00
Dane Springmeyer
6a2a847c3b
remove unused shx code
2012-01-17 10:06:59 -05:00
Dane Springmeyer
2a64b478ef
support as low as geos v3.1.0 - closes #1031
2012-01-17 01:48:02 -05:00
Dane Springmeyer
09857d6e8c
support as low as geos v3.1.0 - closes #1031
2012-01-17 01:48:02 -05:00
Dane Springmeyer
63891cec15
finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around
2012-01-17 01:09:46 -05:00
Dane Springmeyer
b0d0d06564
finish refactor, moving to separate method off datasources to get_geometry_type and using enums all around
2012-01-17 01:09:46 -05:00
Artem Pavlenko
e17c6ec5ff
feature_impl update
2012-01-16 17:55:44 -05:00
Artem Pavlenko
5011cee98c
+ upgrade postgis.input to work with feature_impl
2012-01-16 13:19:31 -05:00
Artem Pavlenko
d207580feb
don't forget to init context_ptr
2012-01-16 13:18:00 -05:00
Artem Pavlenko
87e4f22966
+ update raster plugin to work with new feature_factory
2012-01-16 09:51:31 -05:00
Dane Springmeyer
66a0cfc81f
refactor
2012-01-14 22:35:40 -08:00
Dane Springmeyer
834310f2d8
refactor
2012-01-14 22:35:40 -08:00
Artem Pavlenko
4c39a34ddf
Merge branch 'master' into feature_impl
2012-01-13 10:25:47 +00:00
Dane Springmeyer
2c4a86d4cb
Merge branch 'master' of github.com:mapnik/mapnik into geometry_type_descriptor
2012-01-12 18:48:53 -08:00
Dane Springmeyer
e716d6f440
Merge branch 'master' of github.com:mapnik/mapnik into geometry_type_descriptor
2012-01-12 18:48:53 -08:00
Dane Springmeyer
46d53cb40d
plugins/
...
pass by value
2012-01-12 14:05:03 -08:00
Dane Springmeyer
95c7e4a076
plugins/
...
pass by value
2012-01-12 14:05:03 -08:00
Artem Pavlenko
86ea7f2951
remove unused data members
2012-01-12 12:28:53 +00:00
Artem Pavlenko
159a69a0bb
add shape_utils
2012-01-12 12:20:39 +00:00
Artem Pavlenko
0bb8adbbdc
factor out common code to reduce duplication (shape_utils)
2012-01-12 12:18:50 +00:00
Artem Pavlenko
c6338f82af
use boost::noncopyable
2012-01-12 10:11:01 +00:00
Artem Pavlenko
3bd41e45a4
upgrade shape.input to new feature impl
2012-01-12 10:04:08 +00:00
Dane Springmeyer
975afebd87
ensure all plugins report best guess at top level geometry_type using new descriptor attribute
2012-01-11 20:03:23 -08:00
Dane Springmeyer
7be62e594a
ensure all plugins report best guess at top level geometry_type using new descriptor attribute
2012-01-11 20:03:23 -08:00
Dane Springmeyer
1fa26fa067
close #970 by removing non-north-up restriction which appears not to be working properly
2012-01-09 08:39:22 -08:00
Dane Springmeyer
8d11b0f16e
close #970 by removing non-north-up restriction which appears not to be working properly
2012-01-09 08:39:22 -08:00
Artem Pavlenko
02eb5b8f12
shape: check if multiple parts are interior rings or separate
...
polygons. Currently only test if first coordinate inside exterior
ring and assume first ring is exterior.
If this approach is not robust enough we can calculate ring orientations
instead. Shape file convention is: CW - exterior, CCW - interior.
very simple
2012-01-05 16:24:38 +00:00
Artem Pavlenko
faaa4f6e3f
shape: check if multiple parts are interior rings or separate
...
polygons. Currently only test if first coordinate inside exterior
ring and assume first ring is exterior.
If this approach is not robust enough we can calculate ring orientations
instead. Shape file convention is: CW - exterior, CCW - interior.
very simple
2012-01-05 16:24:38 +00:00
Dane Springmeyer
c551626916
finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries
2011-12-21 12:22:05 -08:00
Dane Springmeyer
89a09208e8
finish geometry cleanup work by ensuring proper behavior in the ogr plugin with multigeometries
2011-12-21 12:22:05 -08:00
Dane Springmeyer
b51c06f5ad
scons: when linking statically include other required libpq deps
2011-12-19 10:51:38 -08:00
Dane Springmeyer
1131d480e9
scons: when linking statically include other required libpq deps
2011-12-19 10:51:38 -08:00
Dane Springmeyer
0bb2cc2d49
add support for 'intersects' token in sqlite plugin - closes #809
2011-12-16 10:05:54 -08:00
Dane Springmeyer
04dd46315e
add support for 'intersects' token in sqlite plugin - closes #809
2011-12-16 10:05:54 -08:00
Dane Springmeyer
c7a6dc597a
sqlite: when building rtree sql, only try WHERE substitution if not doing join
2011-12-16 08:14:08 -08:00
Dane Springmeyer
b518402686
sqlite: when building rtree sql, only try WHERE substitution if not doing join
2011-12-16 08:14:08 -08:00
Dane Springmeyer
1b8e49d13b
sqlite: improve the error message when geometry_field could not be autodetected
2011-12-16 07:48:02 -08:00
Dane Springmeyer
0ebf79e5ea
sqlite: improve the error message when geometry_field could not be autodetected
2011-12-16 07:48:02 -08:00
Dane Springmeyer
95264a2dcb
Merge branch 'master' of github.com:mapnik/mapnik
2011-12-16 06:50:32 -08:00
Dane Springmeyer
39801bf943
Merge branch 'master' of github.com:mapnik/mapnik
2011-12-16 06:50:32 -08:00
Dane Springmeyer
6e18e307ee
Add missing break
2011-12-15 17:18:22 -08:00
Dane Springmeyer
d4b85f55f9
Add missing break
2011-12-15 17:18:22 -08:00
Artem Pavlenko
726cea7ba4
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Artem Pavlenko
ed7abc5c51
Merge branch 'master' into geometry_cleanup
2011-12-14 14:04:30 +00:00
Dane Springmeyer
0bb1073b3f
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
2011-12-12 15:55:33 -08:00
Dane Springmeyer
143efad7cd
csv plugin: allow values with leading zeros to stay as strings - closes #993 - refs https://github.com/mapbox/tilemill/issues/1007
2011-12-12 15:55:33 -08:00
Dane Springmeyer
c0f918114e
sqlite: fixup rtree bbox entries to use cumulative extent of multipolygons to avoid contraint errors
2011-12-12 08:30:46 -08:00
Dane Springmeyer
c837078b38
sqlite: fixup rtree bbox entries to use cumulative extent of multipolygons to avoid contraint errors
2011-12-12 08:30:46 -08:00
Artem Pavlenko
bf2c8c4e9f
make shape_io work with geometry_container concept
2011-12-09 12:25:13 +00:00
Artem Pavlenko
02dce6a756
make shape_io work with geometry_container concept
2011-12-09 12:25:13 +00:00
Artem Pavlenko
7209988fb0
Simplify geometry model to support: Point/LineString/Polygon
...
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
2011-12-06 12:53:16 +00:00
Artem Pavlenko
cc60b74921
Simplify geometry model to support: Point/LineString/Polygon
...
Multi geometries are collections of single geometries
Remove multiple_geometries parameter
2011-12-06 12:53:16 +00:00
Dane Springmeyer
71b281e1cc
osm plugin: report a decent error if the .osm file is not found
2011-12-05 14:30:55 -08:00
Dane Springmeyer
cb504ea4c9
osm plugin: report a decent error if the .osm file is not found
2011-12-05 14:30:55 -08:00
Dane Springmeyer
2fa5bf191a
ogr plugin: throw if non-existant fields are queried - refs #792
2011-12-05 13:57:00 -08:00
Dane Springmeyer
70a191e8d7
ogr plugin: throw if non-existant fields are queried - refs #792
2011-12-05 13:57:00 -08:00
Dane Springmeyer
17852d5140
sqlite: ensure non-existant columns requested in query prompt error by switching quoting character to brackets - closes #984 - refs #792
2011-12-05 13:22:00 -08:00
Dane Springmeyer
d5252187d3
sqlite: ensure non-existant columns requested in query prompt error by switching quoting character to brackets - closes #984 - refs #792
2011-12-05 13:22:00 -08:00
Dane Springmeyer
ddeca1e81e
csv plugin: ensure that the datasource throws if invalid attributes are queried to keep consistent with other datasource - refs #792
2011-12-05 12:03:38 -08:00
Dane Springmeyer
37fee4b674
csv plugin: ensure that the datasource throws if invalid attributes are queried to keep consistent with other datasource - refs #792
2011-12-05 12:03:38 -08:00
Dane Springmeyer
01b0c0b15a
catch a few more mapnik2 references
2011-11-23 20:35:43 -08:00
Dane Springmeyer
b1492d24ab
catch a few more mapnik2 references
2011-11-23 20:35:43 -08:00
Artem Pavlenko
14700dba16
switch back from mapnik2 to mapnik
...
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Artem Pavlenko
b689670ffd
switch back from mapnik2 to mapnik
...
add mapnik2 module which redirects to mapnik and issues DeprecationWarning
2011-11-23 11:33:58 +00:00
Dane Springmeyer
e92d0362a6
sqlite: add (currently unused) in-memory rtree creation code
2011-11-20 16:42:28 -08:00
Dane Springmeyer
d8c6529654
sqlite: add (currently unused) in-memory rtree creation code
2011-11-20 16:42:28 -08:00
Dane Springmeyer
4ab17c9690
postgis: for an empty table (with null results for extent) return early rather than allowing and printing a lexical cast failure
2011-11-20 16:41:47 -08:00
Dane Springmeyer
de673c6d12
postgis: for an empty table (with null results for extent) return early rather than allowing and printing a lexical cast failure
2011-11-20 16:41:47 -08:00
Dane Springmeyer
3b72597f1d
postgis: support PostGIS 2.x - always use ST prefix (removing old testing code) and fixup other debug output - closes #893 and closes #956
2011-11-20 14:29:51 -08:00
Dane Springmeyer
5b94e637a6
postgis: support PostGIS 2.x - always use ST prefix (removing old testing code) and fixup other debug output - closes #893 and closes #956
2011-11-20 14:29:51 -08:00
Dane Springmeyer
9cf15bac0f
alternate in-memory rtree generation, and remove debug output
2011-11-19 11:36:35 -08:00
Dane Springmeyer
f2a4e0c57d
alternate in-memory rtree generation, and remove debug output
2011-11-19 11:36:35 -08:00
Dane Springmeyer
bb38fa986a
use std::string as is convention and comment last bit of unused mutex support in connection manager
2011-11-19 11:35:07 -08:00
Dane Springmeyer
328ecd8c78
use std::string as is convention and comment last bit of unused mutex support in connection manager
2011-11-19 11:35:07 -08:00
Dane Springmeyer
3d66455c64
ensure proper error output from postgis plugin - refs #955
2011-11-17 11:36:16 -08:00
Dane Springmeyer
e99e6da1e5
ensure proper error output from postgis plugin - refs #955
2011-11-17 11:36:16 -08:00
Dane Springmeyer
dddd6fa781
postgis: avoid empty error messages ( closes #955 ) and more verbosity in general if postgres connection fails
2011-11-16 11:27:48 -08:00
Dane Springmeyer
ae68acf633
postgis: avoid empty error messages ( closes #955 ) and more verbosity in general if postgres connection fails
2011-11-16 11:27:48 -08:00
Dane Springmeyer
baebf4f1f2
scons: get linking correct to sqlite dependecies if linking is static
2011-11-15 12:07:46 -08:00
Dane Springmeyer
a6608814d0
scons: get linking correct to sqlite dependecies if linking is static
2011-11-15 12:07:46 -08:00
kunitoki
1251a57e4e
- allow occi to compile with new changes in mapnik::sql_utils
...
- cache table_from_sql instead of recomputing on each query
2011-11-15 14:04:58 +01:00
kunitoki
ef27ecf1cb
- allow occi to compile with new changes in mapnik::sql_utils
...
- cache table_from_sql instead of recomputing on each query
2011-11-15 14:04:58 +01:00
Dane Springmeyer
41663b1941
csv: avoid invalid dereference
2011-11-14 00:34:26 -08:00
Dane Springmeyer
f8a9095e81
csv: avoid invalid dereference
2011-11-14 00:34:26 -08:00
Dane Springmeyer
39d199aa49
code formatting
2011-11-13 19:54:32 -08:00
Dane Springmeyer
4654312d00
code formatting
2011-11-13 19:54:32 -08:00
Dane Springmeyer
62a5e457f1
plugin code formatting based on emacs format in utils/format_source_files
2011-11-13 19:37:50 -08:00
Dane Springmeyer
ce9e44b5f2
plugin code formatting based on emacs format in utils/format_source_files
2011-11-13 19:37:50 -08:00
Dane Springmeyer
5205960326
csv: code formatting
2011-11-13 19:33:57 -08:00
Dane Springmeyer
3fd56f82f5
csv: code formatting
2011-11-13 19:33:57 -08:00
Dane Springmeyer
b3b938a804
sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction
2011-11-13 19:19:22 -08:00
Dane Springmeyer
1653fe0b93
sqlite: let sqlite automatically rollback if needed to avoid potential rollback against no transaction
2011-11-13 19:19:22 -08:00
Dane Springmeyer
73feb36dba
sqlite: trim all types of valid quote characters on table names
2011-11-13 16:41:54 -08:00
Dane Springmeyer
422d112d38
sqlite: trim all types of valid quote characters on table names
2011-11-13 16:41:54 -08:00
Dane Springmeyer
a527bb25e2
sqlite: step_next for a prepared statement must only return SQLITE_DONE
2011-11-13 16:41:34 -08:00
Dane Springmeyer
7ef5778d96
sqlite: step_next for a prepared statement must only return SQLITE_DONE
2011-11-13 16:41:34 -08:00
Dane Springmeyer
b1c2d9f680
sqlite: disassociate extent calculation from rtree auto-index creation, and grab immediate lock on rtree table
2011-11-13 16:02:27 -08:00
Dane Springmeyer
a4715aa8df
sqlite: disassociate extent calculation from rtree auto-index creation, and grab immediate lock on rtree table
2011-11-13 16:02:27 -08:00
Dane Springmeyer
67682f1f36
update hello world build script
2011-11-11 17:03:21 -08:00
Dane Springmeyer
6f665bf7ec
update hello world build script
2011-11-11 17:03:21 -08:00
Dane Springmeyer
1d881af35a
reduce the size of plugin libraries by hiding unneeded symbols
2011-11-11 15:37:10 -08:00
Dane Springmeyer
c8b2ddfaba
reduce the size of plugin libraries by hiding unneeded symbols
2011-11-11 15:37:10 -08:00
Dane Springmeyer
85b938806b
fix csv plugin build
2011-11-11 12:17:39 -08:00
Dane Springmeyer
62753ad245
fix csv plugin build
2011-11-11 12:17:39 -08:00
Dane Springmeyer
df166f5eff
ensure parallel builds work with csv plugin and kismet links to boost thread
2011-11-11 12:13:41 -08:00
Dane Springmeyer
6b98546466
ensure parallel builds work with csv plugin and kismet links to boost thread
2011-11-11 12:13:41 -08:00
Dane Springmeyer
4e4769745f
sqlite: autoquote table names that start with numbers to better support natural earth conversions from shapefiles
2011-11-10 09:42:04 -08:00
Dane Springmeyer
5669226166
sqlite: autoquote table names that start with numbers to better support natural earth conversions from shapefiles
2011-11-10 09:42:04 -08:00
Dane Springmeyer
89e13d304d
sqlite: return success or failure from rtree indexing function and report available tables if the pragma table_info() fails
2011-11-09 19:18:12 -08:00
Dane Springmeyer
bdc726a525
sqlite: return success or failure from rtree indexing function and report available tables if the pragma table_info() fails
2011-11-09 19:18:12 -08:00
Dane Springmeyer
d6cc803ef9
sqlite: proper cleanup if rtree index creation fails
2011-11-09 17:44:50 -08:00
Dane Springmeyer
3ed640a15f
sqlite: proper cleanup if rtree index creation fails
2011-11-09 17:44:50 -08:00
Dane Springmeyer
a058639b24
use c++ style includes
2011-11-09 16:45:18 -08:00
Dane Springmeyer
40ae0efd26
use c++ style includes
2011-11-09 16:45:18 -08:00
Dane Springmeyer
2172e0a409
Merge pull request #943 from mapnik/sqlite-refactor
...
Sqlite refactor
2011-11-09 15:47:58 -08:00
Dane Springmeyer
b0bad47d78
Merge pull request #943 from mapnik/sqlite-refactor
...
Sqlite refactor
2011-11-09 15:47:58 -08:00
Artem Pavlenko
3194707fd3
use rint from global.hpp in windows
2011-11-08 11:50:56 +00:00
Artem Pavlenko
6b0e414aa1
use rint from global.hpp in windows
2011-11-08 11:50:56 +00:00
Dane Springmeyer
6b7635119c
Merge branch 'master' into sqlite-refactor
2011-11-04 20:44:15 -07:00
Dane Springmeyer
dcd19e05e5
Merge branch 'master' into sqlite-refactor
2011-11-04 20:44:15 -07:00
Dane Springmeyer
da4a7af14c
csv: detect as wkt columns with 'geom' substring and use more aggressive detection for blank lines
2011-11-04 07:18:40 -04:00
Dane Springmeyer
a6dfb7b6a4
csv: detect as wkt columns with 'geom' substring and use more aggressive detection for blank lines
2011-11-04 07:18:40 -04:00
Dane Springmeyer
6257ac57c9
sqlite: futher refactoring of sqlite plugin, allowing all tests to pass
2011-11-03 19:51:37 -04:00
Dane Springmeyer
d965bcbeae
sqlite: futher refactoring of sqlite plugin, allowing all tests to pass
2011-11-03 19:51:37 -04:00
Dane Springmeyer
a92c46ff5d
Merge branch 'master' into sqlite-refactor
2011-11-03 09:44:02 -04:00
Dane Springmeyer
426b26650e
Merge branch 'master' into sqlite-refactor
2011-11-03 09:44:02 -04:00
Dane Springmeyer
6c8e4b2de0
csv: back off of null and boolean detection since using strings is more predictable across rows
2011-11-02 11:07:59 -04:00
Dane Springmeyer
6295501ead
csv: back off of null and boolean detection since using strings is more predictable across rows
2011-11-02 11:07:59 -04:00
Dane Springmeyer
1eff83530a
csv: also start auto-detecting ';' and '|' characters as likely separators
2011-11-01 21:11:10 -04:00
Dane Springmeyer
e6ac5d8881
csv: also start auto-detecting ';' and '|' characters as likely separators
2011-11-01 21:11:10 -04:00
Dane Springmeyer
2dfb5e5489
csv: use braces in all cases
2011-11-01 20:48:30 -04:00
Dane Springmeyer
16ab2ba895
csv: use braces in all cases
2011-11-01 20:48:30 -04:00
Dane Springmeyer
4cec91ff82
csv: handle empty headers, an apparently common situation with large government data
2011-11-01 20:33:05 -04:00
Dane Springmeyer
7f2d3e09f2
csv: handle empty headers, an apparently common situation with large government data
2011-11-01 20:33:05 -04:00
