Skip to content
This repository

2.0.x pgis vector reduction #1147

Closed
wants to merge 33 commits into from

6 participants

Sandro Santilli Dane Springmeyer Robert Coup kunitoki Matt Amos Artem Pavlenko
Sandro Santilli
strk commented

Implements automatic vector simplification for postgis inputs, driven by XML parameter (#1136)

springmeyer and others added some commits
Dane Springmeyer springmeyer update changelog - #908 86a1d96
Robert Coup rcoup Do a proper check for BOOST_PYTHON_LIB in scons, and change it to be …
…only the library name. re: mapnik-packaging:#3
7eef4af
Robert Coup rcoup [fixes #904] Python2.5 compatibility. 5c76218
Dane Springmeyer springmeyer backport postgis 2.x fix to mapnik 2.0.x series branch - refs #956 c4edd2b
Dane Springmeyer springmeyer remove unintended plugin line that snuck in from master merge 58c29c0
kunitoki kunitoki - fix mapnik-config --version
- closes #903
babe1b6
Dane Springmeyer springmeyer backport to 2.0.2 fix for ubuntu compile error with boost 1.42 - refs #… 496b393
Dane Springmeyer springmeyer add permissive flag to ogr and shape plugins to work around boost int…
…erprocess compile bug - closes #1082 - refs #950 and #1001
01d6567
Dane Springmeyer springmeyer yet another -fpermissive - refs #1082, #950 and #1001 53e171c
Dane Springmeyer springmeyer backport hextree sorting fix to 2.0.x series - refs #1087 ee8a150
Matt Amos zerebubuth Still need to increment pos counter in shapeindex even when the geome…
…try is null, otherwise reads are possible beyond the end of file.
90fccfe
Dane Springmeyer springmeyer avoid mutex locks on pj_transform for proj 4.7 and above - closes #1072 150c9f8
Dane Springmeyer springmeyer sync changelog 3a086b8
Dane Springmeyer springmeyer support as low as geos v3.1.0 - closes #1031 21af038
Dane Springmeyer springmeyer postgis: remove last usage of deprecated functions - fully supporting…
… postgis 2.0 - closes #1083
b0c6378
Dane Springmeyer springmeyer add emacs temporaries to gitignores 4292cf1
Dane Springmeyer springmeyer update CHANGELOG 7a10bef
Dane Springmeyer springmeyer backport to 2.0.x series the sqlite3_open_v2 usage from master - refs #… 34ddc65
Dane Springmeyer springmeyer remove ogcserver - now at https://github.com/mapnik/OGCServer e7f6267
Dane Springmeyer springmeyer backport 'switch naming back from libmapnik2 -> libmapnik (also pytho…
…n)' and remove svn traces (refs #941)
9ddef64
Dane Springmeyer springmeyer make available MAPNIK_VERSION_STRING in c++ header (not just in pytho…
…n) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released
1912362
Dane Springmeyer springmeyer fix linux soname formatting 8229b22
Dane Springmeyer springmeyer properly format abi versions in a few more placesa 91ad01b
Dane Springmeyer springmeyer add deprecated python module alias for backward compatibility cacc909
Dane Springmeyer springmeyer remove id e66d724
Dane Springmeyer springmeyer Merge branch '2.0.x' of github.com:mapnik/mapnik into 2.0.x a6891f2
Dane Springmeyer springmeyer since mapnik::layer is public api, add forward compatibility with >= …
…mapnik 2.1.x
896bcbd
Artem Pavlenko artemp avoid creating default initialised values if key doesn't exist 49f0df0
Dane Springmeyer springmeyer add 0f5ab18 backport to changelog 19f43c9
Dane Springmeyer springmeyer Revert "avoid mutex locks on pj_transform for proj 4.7 and above - cl…
…oses #1072"

This reverts commit 150c9f8.
0be7d66
Dane Springmeyer springmeyer remove #1072 from changelog as it was ultimately reverted from 2.0.x …
…branch
50abe35
Sandro Santilli strk PostGIS vectors reduction, XML parameter driven (#1136) 46c3cc2
Sandro Santilli strk Tolerate _half_ a pixel error - one per side on boundaries (#1136) c33c932
Dane Springmeyer
Owner

so, you'd like this applied to 2.0.x? I'd prefer to only apply it to master (upcoming 2.1.x) since it is a new feature and 2.0.x is for stable bugfixes.

If you really need it against 2.0.x can you please provide a simple .diff since the above auto merge is not going to work.

Sandro Santilli
strk commented

I'm ok to see it in master. How far away 2.1.x is ?
Did you run your profilings ?

Dane Springmeyer
Owner

2.1.x is 2-3 months away. No, I've not had time to do any profiling on my end yet.

Sandro Santilli
strk commented

So do you need a new patch against the tip of master ?
Meanwhile I'm working on another speedup for point layers...

Dane Springmeyer
Owner

yes, against master.

Sandro Santilli
strk commented

I just pushed a master-pgis_vector_reduction branch on my github repo, with a single commit rebased to master

Sandro Santilli
strk commented

made another pull request: #1179

Sandro Santilli strk closed this
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Showing 33 unique commits by 6 authors.

Oct 17, 2011
Dane Springmeyer springmeyer update changelog - #908 86a1d96
Oct 21, 2011
Robert Coup rcoup Do a proper check for BOOST_PYTHON_LIB in scons, and change it to be …
…only the library name. re: mapnik-packaging:#3
7eef4af
Oct 30, 2011
Robert Coup rcoup [fixes #904] Python2.5 compatibility. 5c76218
Nov 20, 2011
Dane Springmeyer springmeyer backport postgis 2.x fix to mapnik 2.0.x series branch - refs #956 c4edd2b
Nov 29, 2011
Dane Springmeyer springmeyer remove unintended plugin line that snuck in from master merge 58c29c0
kunitoki kunitoki - fix mapnik-config --version
- closes #903
babe1b6
Jan 17, 2012
Dane Springmeyer springmeyer backport to 2.0.2 fix for ubuntu compile error with boost 1.42 - refs #… 496b393
Feb 15, 2012
Dane Springmeyer springmeyer add permissive flag to ogr and shape plugins to work around boost int…
…erprocess compile bug - closes #1082 - refs #950 and #1001
01d6567
Dane Springmeyer springmeyer yet another -fpermissive - refs #1082, #950 and #1001 53e171c
Feb 24, 2012
Dane Springmeyer springmeyer backport hextree sorting fix to 2.0.x series - refs #1087 ee8a150
Matt Amos zerebubuth Still need to increment pos counter in shapeindex even when the geome…
…try is null, otherwise reads are possible beyond the end of file.
90fccfe
Dane Springmeyer springmeyer avoid mutex locks on pj_transform for proj 4.7 and above - closes #1072 150c9f8
Dane Springmeyer springmeyer sync changelog 3a086b8
Dane Springmeyer springmeyer support as low as geos v3.1.0 - closes #1031 21af038
Dane Springmeyer springmeyer postgis: remove last usage of deprecated functions - fully supporting…
… postgis 2.0 - closes #1083
b0c6378
Mar 14, 2012
Dane Springmeyer springmeyer add emacs temporaries to gitignores 4292cf1
Dane Springmeyer springmeyer update CHANGELOG 7a10bef
Dane Springmeyer springmeyer backport to 2.0.x series the sqlite3_open_v2 usage from master - refs #… 34ddc65
Dane Springmeyer springmeyer remove ogcserver - now at https://github.com/mapnik/OGCServer e7f6267
Dane Springmeyer springmeyer backport 'switch naming back from libmapnik2 -> libmapnik (also pytho…
…n)' and remove svn traces (refs #941)
9ddef64
Mar 15, 2012
Dane Springmeyer springmeyer make available MAPNIK_VERSION_STRING in c++ header (not just in pytho…
…n) and add MAPNIK_VERSION_IS_RELEASE define that indicates if the code is released
1912362
Dane Springmeyer springmeyer fix linux soname formatting 8229b22
Dane Springmeyer springmeyer properly format abi versions in a few more placesa 91ad01b
Dane Springmeyer springmeyer add deprecated python module alias for backward compatibility cacc909
Dane Springmeyer springmeyer remove id e66d724
Dane Springmeyer springmeyer Merge branch '2.0.x' of github.com:mapnik/mapnik into 2.0.x a6891f2
Dane Springmeyer springmeyer since mapnik::layer is public api, add forward compatibility with >= …
…mapnik 2.1.x
896bcbd
Mar 16, 2012
Artem Pavlenko artemp avoid creating default initialised values if key doesn't exist 49f0df0
Dane Springmeyer springmeyer add 0f5ab18 backport to changelog 19f43c9
Mar 24, 2012
Dane Springmeyer springmeyer Revert "avoid mutex locks on pj_transform for proj 4.7 and above - cl…
…oses #1072"

This reverts commit 150c9f8.
0be7d66
Dane Springmeyer springmeyer remove #1072 from changelog as it was ultimately reverted from 2.0.x …
…branch
50abe35
Mar 26, 2012
Sandro Santilli strk PostGIS vectors reduction, XML parameter driven (#1136) 46c3cc2
Mar 27, 2012
Sandro Santilli strk Tolerate _half_ a pixel error - one per side on boundaries (#1136) c33c932
Something went wrong with that request. Please try again.