Konstantin Käfer
|
f7cdee8312
|
Merge branch 'master' into grouped-rendering
Conflicts:
include/mapnik/feature_type_style.hpp
src/feature_type_style.cpp
|
2011-12-07 22:02:29 +01:00 |
|
Artem Pavlenko
|
00ed6ffd5e
|
Merge branch 'master' into geometry_cleanup
|
2011-12-07 09:29:41 +00:00 |
|
Artem Pavlenko
|
39507d30f0
|
Merge branch 'master' into geometry_cleanup
|
2011-12-07 09:29:41 +00:00 |
|
Artem Pavlenko
|
283e2066e9
|
fix missing qualifier
|
2011-12-07 09:16:24 +00:00 |
|
Artem Pavlenko
|
0aab8c0944
|
fix missing qualifier
|
2011-12-07 09:16:24 +00:00 |
|
Dane Springmeyer
|
556bc2c869
|
remove special ltdl dladvise usage - no longer needed after #790
|
2011-12-06 18:23:01 -08:00 |
|
Dane Springmeyer
|
e1d0795617
|
remove special ltdl dladvise usage - no longer needed after #790
|
2011-12-06 18:23:01 -08:00 |
|
Dane Springmeyer
|
59d0e306cf
|
include <cstring> to std::memcpy on linux - refs #76 and closes #987
|
2011-12-06 16:57:34 -08:00 |
|
Dane Springmeyer
|
a016dbe2c7
|
include <cstring> to std::memcpy on linux - refs #76 and closes #987
|
2011-12-06 16:57:34 -08:00 |
|
Dane Springmeyer
|
1700ffe9cf
|
remove svn revision reporting as it is not longer relevant to git versioned mapnik
|
2011-12-06 16:52:50 -08:00 |
|
Dane Springmeyer
|
1190f3003d
|
remove svn revision reporting as it is not longer relevant to git versioned mapnik
|
2011-12-06 16:52:50 -08:00 |
|
Artem Pavlenko
|
77adf6cec6
|
+ make geometry noncopyable
+ make ctor explicit
|
2011-12-06 16:25:30 +00:00 |
|
Artem Pavlenko
|
9f27706e81
|
+ make geometry noncopyable
+ make ctor explicit
|
2011-12-06 16:25:30 +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 |
|
Artem Pavlenko
|
7c9a67bef3
|
Merge remote-tracking branch 'origin/master'
|
2011-12-06 12:01:06 +00:00 |
|
Artem Pavlenko
|
8121b0c947
|
Merge remote-tracking branch 'origin/master'
|
2011-12-06 12:01:06 +00:00 |
|
Artem Pavlenko
|
77ddcaf81b
|
implement vertex_iterator on vertex_vector
|
2011-12-06 11:19:24 +00:00 |
|
Artem Pavlenko
|
2c9e151c41
|
implement vertex_iterator on vertex_vector
|
2011-12-06 11:19:24 +00:00 |
|
Artem Pavlenko
|
91617e7b21
|
cleanup typedefs, changed template params: vertex_type -> coord_type
|
2011-12-06 11:17:14 +00:00 |
|
Artem Pavlenko
|
d09fe46a04
|
cleanup typedefs, changed template params: vertex_type -> coord_type
|
2011-12-06 11:17:14 +00:00 |
|
Artem Pavlenko
|
2b05d69fef
|
fix typedef names, expose value_type
|
2011-12-06 11:15:37 +00:00 |
|
Artem Pavlenko
|
a4e08da00b
|
fix typedef names, expose value_type
|
2011-12-06 11:15:37 +00:00 |
|
Artem Pavlenko
|
b8ce995acd
|
better typedef names
remove unused header
|
2011-12-06 10:34:25 +00:00 |
|
Artem Pavlenko
|
2d95518b22
|
better typedef names
remove unused header
|
2011-12-06 10:34:25 +00:00 |
|
Artem Pavlenko
|
4e57134c8c
|
geometry type is known at this stage.
|
2011-12-06 09:04:44 +00:00 |
|
Artem Pavlenko
|
b8bd9676fc
|
geometry type is known at this stage.
|
2011-12-06 09:04:44 +00:00 |
|
Dane Springmeyer
|
410dea5001
|
only serialize Parameters if one or more exist
|
2011-12-05 18:22:25 -08:00 |
|
Dane Springmeyer
|
1e8a5b58b4
|
only serialize Parameters if one or more exist
|
2011-12-05 18:22:25 -08:00 |
|
Dane Springmeyer
|
9203639640
|
fully spell out parameters on the map object - refs #977
|
2011-12-05 18:05:35 -08:00 |
|
Dane Springmeyer
|
f0241c0170
|
fully spell out parameters on the map object - refs #977
|
2011-12-05 18:05:35 -08:00 |
|
Dane Springmeyer
|
9e924bfa11
|
add ability to have typed arbitrary parameters in xml - refs #977
|
2011-12-05 14:46:38 -08:00 |
|
Dane Springmeyer
|
b78b8e735b
|
add ability to have typed arbitrary parameters in xml - refs #977
|
2011-12-05 14:46:38 -08: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
|
dbce93669a
|
add basic tests for osm plugin
|
2011-12-05 14:30:18 -08:00 |
|
Dane Springmeyer
|
1d30cb5698
|
add basic tests for osm plugin
|
2011-12-05 14:30:18 -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
|
e3e0755f70
|
tests: ensure ogr plugin throws on non-existant field names (currently fails) - refs #792
|
2011-12-05 13:33:37 -08:00 |
|
Dane Springmeyer
|
7c0bceb6de
|
tests: ensure ogr plugin throws on non-existant field names (currently fails) - refs #792
|
2011-12-05 13:33:37 -08:00 |
|
Dane Springmeyer
|
d836571a8d
|
add tests for reading shapefiles via ogr
|
2011-12-05 13:32:37 -08:00 |
|
Dane Springmeyer
|
df64c1690c
|
add tests for reading shapefiles via ogr
|
2011-12-05 13:32:37 -08:00 |
|
Dane Springmeyer
|
1f2a55172e
|
tests: test sqlite error behavior on non-existant fields - refs #984/#792
|
2011-12-05 13:24:11 -08:00 |
|
Dane Springmeyer
|
75190a7050
|
tests: test sqlite error behavior on non-existant fields - refs #984/#792
|
2011-12-05 13:24:11 -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
|
bc63c9b589
|
tests: ensure shapefile plugin throws if invalid query is made - refs #792
|
2011-12-05 12:17:30 -08:00 |
|
Dane Springmeyer
|
9cb1c9c7f7
|
tests: ensure shapefile plugin throws if invalid query is made - refs #792
|
2011-12-05 12:17:30 -08:00 |
|
Dane Springmeyer
|
9be619cee4
|
tests: ensure postgis plugin throws if invalid query is made - refs #792
|
2011-12-05 12:11:59 -08:00 |
|