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

4319 commits

This branch
This branch
All branches
Author SHA1 Message Date
Artem Pavlenko
ad3072300f + remove mutable qualifiers 2012-03-05 15:29:21 +00:00
Artem Pavlenko
0cd93835f8 + update osm.input 2012-03-05 15:15:39 +00:00
Artem Pavlenko
a67e9dc967 + update sqlite.input 2012-03-05 15:05:09 +00:00
Artem Pavlenko
90323ffc74 + update raster.input 2012-03-05 14:43:59 +00:00
Artem Pavlenko
a22cc87df7 + update ogr.input 2012-03-05 14:38:04 +00:00
Artem Pavlenko
0b8a3323c2 + update gdal.input 2012-03-05 14:32:08 +00:00
Artem Pavlenko
9cbd4ad932 + make init(parameters const&) private 2012-03-05 14:21:57 +00:00
Artem Pavlenko
9ace240a67 + update rundemo.py 2012-03-05 14:10:30 +00:00
Artem Pavlenko
6de8a9066c + update viewer to work with new datasource/layer interface 2012-03-05 14:09:52 +00:00
Artem Pavlenko
accd81192b + remove bind() logic from shape and postgis plug-ins 2012-03-05 14:09:19 +00:00
Artem Pavlenko
9d24ed04f5 + update python bindings to use new datasource interface 
+ datasource_parameters accept Python dictionary e.g

```
>>> import mapnik
>>> l = mapnik.Layer("test")
>>> l.datasource_parameters = {"type":"shape","file":"/tmp/world.shp"}
```
 2012-03-05 14:06:36 +00:00
Artem Pavlenko
02b2a55ecc + update load/save map to work with mapnik::parameters 2012-03-05 14:04:36 +00:00
Artem Pavlenko
5e63e42673 + temp fix to compile : FIXME 2012-03-05 14:04:06 +00:00
Artem Pavlenko
9a0248559f + move 'bind' logic from datasource level to layer 
+ store and copy mapnik::parameters only in mapnik::layer
+ make datasource_ptr mutable
 2012-03-05 13:59:12 +00:00
Hermann Kraus
ad86e9aebc Reenable text meta writers. 2012-03-04 23:25:13 +01:00
Hermann Kraus
5578bdb6f9 Remove has_dimensions and dimensions from text_placement_info. 
This functionality is better provided by placement_finder.additional_boxes.
 2012-03-04 16:38:40 +01:00
Hermann Kraus
46272d836b Move more variables from text_placements_info to placement_finder. 
Refs #1048.
 2012-03-04 13:32:10 +01:00
Hermann Kraus
4638b28c36 Store pointer to char_info in text_path instead of pointer to char_properties. 2012-03-04 03:53:39 +01:00
Hermann Kraus
b5e1ebfac8 New reference images. 2012-03-04 02:06:03 +01:00
Hermann Kraus
0eece15f62 New tests. 2012-03-04 02:04:43 +01:00
Hermann Kraus
b4eddaab24 Move variables from text_placements_info to placement_finder. 
Reuse placement_finder objects.
Pass feature to placement_finder.
Refs #1048.
 2012-03-04 01:49:01 +01:00
Hermann Kraus
36918e4a8b Remove warning. Empty expressions might exist in real applications without being an error. 2012-03-03 17:41:43 +01:00
Hermann Kraus
586cdff6e8 Add new test. 2012-03-03 16:32:31 +01:00
Hermann Kraus
0ef573c197 Avoid accidential uploading of test file to OSM server. 2012-03-03 16:31:49 +01:00
Hermann Kraus
f8c784b0a6 Correctly center text. 2012-03-03 13:53:08 +01:00
Hermann Kraus
c47eb3642a Reformat test and extend to verify text is centered correctly. 2012-03-03 13:53:08 +01:00
Dane Springmeyer
7163806cda c++ style 2012-03-02 18:51:19 -08:00
Dane Springmeyer
e622c9548d Merge branch 'master' of github.com:mapnik/mapnik 2012-03-02 18:47:11 -08:00
Hermann Kraus
2bf9d9dbdf Fix handling of empty XML nodes. 
Closes #1106.
 2012-03-03 01:12:23 +01:00
Dane Springmeyer
ca3bd722c1 Merge branch 'master' of github.com:mapnik/mapnik 2012-03-02 10:01:11 -08:00
Hermann Kraus
cc547385e6 Avoid adding the same text to detector twice. 2012-03-02 12:39:38 +01:00
Artem Pavlenko
c25e8c7d94 Merge remote-tracking branch 'origin/master' 2012-03-02 09:34:57 +00:00
Hermann Kraus
1fcfbaac52 Add test for TextSymbolizer line placement. 2012-03-02 01:45:44 +01: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
803447a8d8 disable non-critical failing test after reverting shapefile polygon handling - refs #1093 2012-02-28 20:18:47 -08:00
Dane Springmeyer
a837b1ae80 specialize getting strings from ptree to avoid excess copying 2012-02-28 20:13:37 -08:00
Dane Springmeyer
7c8341e7c3 formatting 2012-02-28 20:12:13 -08:00
Hermann Kraus
9e397ae55e Add iterator increment which I forgot in 96d8dfb356. 2012-02-28 02:05:44 +01:00
Hermann Kraus
df4eae2f71 Merge branch 'master' of github.com:mapnik/mapnik 
Conflicts:
	src/symbolizer_helpers.cpp
 2012-02-28 01:48:26 +01:00
Hermann Kraus
66ef7a450a Add marker to collision detector. 
Refs #1106.
 2012-02-28 01:47:24 +01:00
Dane Springmeyer
82bd78d9a5 use boost::make_shared instead of new as per mapnik coding conventions 2012-02-27 16:39:34 -08:00
Dane Springmeyer
a5d7239cfc fix minor spelling in code comments 2012-02-27 16:15:36 -08:00
Hermann Kraus
96d8dfb356 Improve code a bit. 
size() can be O(n) but empty() is always O(1).
 2012-02-28 00:52:02 +01:00
Dane Springmeyer
1ed193728d add missing update_detector() - refs #1106 2012-02-27 15:15:27 -08: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
ce3078fa98 inline to avoid duplicate symbol errors with gcc 2012-02-25 09:29:14 -08:00
Dane Springmeyer
9aff28f768 fix compile with boost 1.42 2012-02-24 19:22:48 -08:00
Dane Springmeyer
e6abd143a8 c++ casts to avoid compiler warnings on msvc 2012-02-24 18:58:34 -08:00