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

12904 commits

This branch
This branch
All branches
Author SHA1 Message Date
Mickey Rose
89d0c6da19 SConstruct: change rollback_option to free function 
It shouldn't be a conftest. First, it doesn't act like one. Second,
calling it as conf.rollback_option from within another conftest before
calling context.Result confuses scons, it doesn't expect conftests to be
nested and reports "error: no result" for the outer one as soon as the
inner is called.
 2018-06-29 16:24:04 +02:00
Mickey Rose
16eb870303 SConstruct: fixup config.log message order 
- always call .Message before .TryRun
- always unpack .TryRun result tuple
 2018-06-29 16:07:47 +02:00
Mickey Rose
a17de02ce4 SConstruct: fixup ICU min version check 
- "Say what you mean." The check is for version >= 4.0, not 4.2
- call .Message before .TryRun
- don't silence .Result
 2018-06-29 16:00:23 +02:00
Mickey Rose
a2af3a53fa SConstruct: fixup HarfBuzz configure checks 
- call .Message before .TryRun
- don't silence .Result
- report found version even if it's really old and doesn't even define
  HB_VERSION_ATLEAST macro
 2018-06-29 15:48:51 +02:00
Dane Springmeyer
42d3f2d0d3
Merge pull request #3917 from mapnik/only-throw-on-dupe-style-in-strict-mode 
Only throw on duplicate styles in strict mode
 2018-06-26 18:20:35 -07:00
Dane Springmeyer
d60be13ed8 remove unused code 2018-06-26 15:57:21 -07:00
Blake Thompson
a914047770
Merge pull request #3920 from manaswinidas/improve 
Improves INSTALL.md
 2018-06-26 11:24:38 -07:00
Dane Springmeyer
c458cf0c57 test duplicate style throw behavior exactly 2018-06-26 09:53:12 -07:00
Manaswini Das
1d7fc9c070
Improves INSTALL.md 2018-06-26 21:16:03 +05:30
Dane Springmeyer
434511ca3b fix to only throw in strict mode 2018-06-24 19:08:38 -07:00
Dane Springmeyer
7673bbe827 only throw on duplicate styles in strict mode 2018-06-24 10:19:33 -07:00
Dane Springmeyer
e9ebc938e0 [build] ensure we don't fail abruptly in BOOST_LIB_VERSION_FROM_HEADER is unknown 2018-06-19 17:21:50 -07:00
Artem Pavlenko
9cd40947d8 update deps 2018-06-07 09:51:29 +01:00
Artem Pavlenko
7c8215dfda Merge branch 'Algunenano-blessed_offset_clip' 2018-06-07 09:45:43 +01:00
Artem Pavlenko
977c86af6c update visual test data 2018-06-07 09:45:14 +01:00
Raul Marin
8e11ef3fd7 Improve padding calculation 2018-06-06 18:39:15 +02:00
Artem Pavlenko
a396282189
Merge pull request #3905 from ISNIT0/patch-1 
Update INSTALL.md
 2018-05-30 15:32:31 +01:00
Joe Reeve
e84fbf1523
Update INSTALL.md 
Added a `cd` to allow for simpler execution (copy-paste)
 2018-05-30 10:51:46 +01:00
Artem Pavlenko
16501f8641
Merge pull request #3899 from Algunenano/master_line_middle 
Marker symbolizer: Fix bug with lines with 0 length
 2018-05-21 15:53:59 +01:00
Artem Pavlenko
102fc3eaf9
Merge pull request #3892 from Algunenano/master_freetype29 
Use pkg-config to find FreeType2 if available
 2018-05-21 15:52:14 +01:00
Raul Marin
0becc1c5e9 Markers point placement: Add some basic tests 2018-05-11 15:39:55 +02:00
Raul Marin
0195047d7a Marker symbolizer: Fix bug with lines with 0 length (division by zero) 2018-05-11 12:24:01 +02:00
Artem Pavlenko
b7e486d3c3
Merge pull request #3897 from mapycz/refactor-scale-denom 
Scale denominator: a bit of refactoring
 2018-05-09 08:46:09 +01:00
Jiri Drbalek
846e961b05 Replace magic number with described constant 2018-05-08 16:54:46 +00:00
Artem Pavlenko
d75a73a727
Merge pull request #3896 from mapycz/rm-ellipsoid 
Remove useless ellipsoid.hpp
 2018-05-08 17:47:02 +01:00
Artem Pavlenko
c2fe73ecbe
Merge pull request #3895 from mapycz/postgis-connection-creator-id 
postgis: Exclude password from ConnectionCreator::id()
 2018-05-08 17:46:26 +01:00
Artem Pavlenko
051f2fa906
Merge pull request #3894 from mapycz/postgis-connection-manager-thread-safe 
postgis: Thread safe ConnectionManager
 2018-05-08 17:44:45 +01:00
Jiri Drbalek
3deb55cc5f Use existing constant 2018-05-08 16:44:41 +00:00
Jiri Drbalek
89b5cb4f22 Remove useless ellipsoid.hpp 2018-05-08 15:39:13 +00:00
Jiri Drbalek
ab05de48df postgis: Exclude password from ConnectionCreator::id() 
- Password is not necessary for connection identification
- When password is not required by the database,
  user can accidentally use multiple different passwords
  without noticing.
  This leads to allocating more connection pools
  and increase of connection consumption.
 2018-05-07 13:49:57 +00:00
Jiri Drbalek
497055d80d postgis: Thread safe ConnectionManager 2018-05-04 20:18:04 +00:00
Raul Marin
23755a527a Use pkg-config to find FreeType2 if available 2018-05-03 17:07:37 +02:00
Artem Pavlenko
d8dbe11fd0 Merge branch 'Algunenano-master_overlap' 2018-04-30 09:52:04 +02:00
Artem Pavlenko
871991dced Merge branch 'master_overlap' of https://github.com/Algunenano/mapnik into Algunenano-master_overlap 2018-04-30 09:51:15 +02:00
Artem Pavlenko
4691315e5a
Merge pull request #3891 from mapnik/compiler-detect 
don't error oddly if compiler is not found
 2018-04-30 09:15:34 +02:00
Dane Blakely Springmeyer
8af9bfe8e0 don't error oddly if compiler is not found 2018-04-29 21:08:36 -07:00
Raul Marin
3171b89fea Generalize overlap_optimization to use points and text too 2018-04-27 17:15:03 +02:00
Raul Marin
0a2be27ba9 Use overlap optimization in load_map_string too 2018-04-27 17:14:57 +02:00
Artem Pavlenko
def0fd1f31 prepare for breaking change in spirit::x3 (from boost 1.67.0) - remove with_context usage 
(ref https://github.com/boostorg/spirit/pull/239)
 2018-04-16 15:25:39 +02:00
Artem Pavlenko
b392b8214e add explicit instantiation declarations to DEFINE_ENUM macro to fix -Wundefined-var-template warnings. 2018-04-16 11:12:05 +02:00
Artem Pavlenko
fe5c4bb978 supress unused variable warning in boost state_machine 2018-04-16 11:08:08 +02:00
Artem Pavlenko
82fb67441f
Merge pull request #3880 from Algunenano/master_icu61 
Qualify ICU types explicitly
 2018-04-10 10:32:30 +02:00
Artem Pavlenko
f04248e57d Merge branch 'mapycz-save-map-denominator' 2018-04-10 10:27:40 +02:00
Artem Pavlenko
d2d587cb1b mapycz-save-map-denominator 2018-04-10 10:25:23 +02:00
Raul Marin
1ddfe6c315 Qualify ICU types explicitly 
ICU 61 has dropped the global `using namespace icu;`
http://site.icu-project.org/download/61#TOC-Migration-Issues
 2018-04-03 13:18:43 +02:00
Blake Thompson
f7098a8a7e
Merge pull request #3873 from mapnik/gdal_overview_fix 
GDAL Driver Overview Fix and Memory Reduction - Master
 2018-03-30 16:45:58 -05:00
Blake Thompson
a217b38fd5 Updated to use max_image_area as a datasource parameter for GDAL plugin 2018-03-30 15:40:30 -05:00
Blake Thompson
25e4bb3f6c A fix for two distinct issues associated with gdal featuresets, the first is overviews were not properly being utilized based on the resolution of the final image requested. The second is that allocation of far too much memory could be possible in GDAL to attempt to do resampling internally in mapnik. This now has a hard cap so that we allocate less memory in these situations but are still able to resample internally in mapnik. 2018-03-30 15:10:29 -05:00
Dane Springmeyer
65b4afdfc1
Merge pull request #3876 from Algunenano/blessed_master_threadsafe_disabled 
Fix build issue with MAPNIK_THREADSAFE disabled
 2018-03-26 12:15:34 -04:00
Raul Marin
caa2a88177 Fix build issue with MAPNIK_THREADSAFE disabled 2018-03-26 18:08:44 +02:00