Mathis Logemann
d86a90a10a
more cmake
2020-11-20 21:15:27 +01:00
Mathis Logemann
e6f6d0f133
more cmake
2020-11-20 20:20:28 +01:00
Mathis Logemann
945e57286b
initial cmake scripts
2020-11-20 18:20:43 +01:00
Mathis Logemann
64054fade4
compiler independent warning ignore
...
Signed-off-by: Mathis Logemann <mathisloge@gmail.com>
2020-11-19 17:25:10 +01:00
Artem Pavlenko
0d693b151d
svg2png: use svgBBOX() to calculate output PNG dimensions when no valif width or height (or viewBox) is specified.
2020-02-05 15:06:11 +00:00
Mickey Rose
39202f5ac0
mapnik-config: fix substitution of environment variables
...
Simply calling str(val) doesn't work, because if the value happens to
be a SCons.Util.CLVar, it may contain not just plain strings, but also
tuples appended by SCons.Environment.ParseFlags.
For example "-isysroot /foo" becomes CLVar: [("-isysroot", "/foo")]
CLVar.__str__ supports only string elements, nothing else.
2020-01-30 15:15:14 +01:00
Artem Pavlenko
ed194a3c09
use std::round (ref: https://en.cppreference.com/w/cpp/numeric/math/round )
2020-01-23 15:48:16 +00:00
Artem Pavlenko
b6e9711add
Mark output image as premultiplied alpha
2020-01-22 10:49:10 +00:00
Artem Pavlenko
97e33ec8ca
Move 0.5 up/down rounding into rounding expression (via @lightmare 7f54e94748 (r369294323)) (ref #4116 )
2020-01-22 10:45:15 +00:00
Artem Pavlenko
4276f01404
Init output image with transparent color and 255 alpha.
2020-01-21 15:12:18 +00:00
Artem Pavlenko
7f54e94748
Add support for scale-factor parameter - useful for debugging SVG issues (ref #4112 )
2020-01-21 10:33:04 +00:00
Mickey Rose
f19bd188c2
2to3 last remnants of Python 2 syntax
2019-12-31 12:39:57 +01:00
Mickey Rose
d1697efe6d
install mapbox includes into subdir mapnik/deps/
2019-09-20 20:15:53 +02:00
Mickey Rose
2dcb31cd01
mapnik-config: minor cleanup
2019-09-16 23:30:01 +02:00
Mickey Rose
a3086c06a5
mapnik-config: improve mapnik-config.template.sh
...
- move template text from build.py into mapnik-config.template.sh,
so that the resulting script is simply that template file after
substitutions, instead of concatenation of two parts
- substitute using re.sub matching particular variables, instead of
format % dict; this allows putting default values in the template
2019-09-16 23:17:09 +02:00
Mickey Rose
c61d0d541d
Revert "Forgot to add prefix change to mapnik config to cairo as well"
...
This reverts commit a9712ed081
2019-09-15 12:30:37 +02:00
Mickey Rose
297126906d
Revert "Added an update to mapnik config so that it can provide relative path to libraries better in node mapnik."
...
This reverts commit a4aee2eb59
2019-09-15 12:30:28 +02:00
lightmare
a0ea7db1a7
Merge pull request #3984 from lightmare/pg-app-name
...
accept explicit parameter "application_name" in postgis and pgraster datasources
2019-08-12 12:52:34 +02:00
Artem Pavlenko
b617197aba
Merge branch 'master' of https://github.com/timmg/mapnik into timmg-master
2019-07-02 11:51:45 +01:00
Nikita Kniazev
c191e196c0
Replace MAPNIK_INIT_PRIORITY workaround
...
Spirit rules are just placeholders. They are cheap to construct and by doing
this static initialization order fiasco problem is effectively avoided.
Also had to fix name clash between geojson and generic json parsers.
2019-07-02 01:04:31 +03:00
Tim Gleason
cdcc97ac4b
Add command line options for map size to mapnik-render.
2019-05-05 12:02:47 -04:00
Mickey Rose
86e70a726d
postgres: add connect param "application_name"
2018-09-07 11:07:33 +02:00
Artem Pavlenko
65080e2a95
add support for BOOST_VERSION < 106700
2018-07-23 10:58:27 +01:00
Artem Pavlenko
664d3508de
remove reference_wrapper usage when injecting attributes into grammar ( >= boost_1_67) [skip-ci]
2018-04-18 12:53:17 +02:00
Artem Pavlenko
c12f11fe42
Merge pull request #3837 from mat007/fix-unicode-file-path-on-windows
...
Handle unicode file path on windows in command line tools
2018-02-26 12:23:11 +01:00
Artem Pavlenko
8876d13356
improve errors reporting in mapnik-index
2018-02-21 16:02:12 +01:00
Mathieu Champlon
22d0cb72fd
Handle unicode file path on windows
2018-01-20 22:24:05 +01:00
Michael Corey
e5e0b7674a
Replaced old-style exception for Python 3 compatibility.
2018-01-10 21:50:49 -08:00
Artem Pavlenko
c29f944726
Merge branch 'fix-group-symbolizer-crash' of https://github.com/lightmare/mapnik into lightmare-fix-group-symbolizer-crash
2018-01-05 12:16:41 +00:00
Artem Pavlenko
5732df452c
support SCons 3 (initial attempt)
2017-11-16 11:59:55 +01:00
Artem Pavlenko
b2f3fdb73b
Merge branch 'master' into bbox-index
2017-09-11 10:47:50 +01:00
Dane Springmeyer
8689048ba6
port #3759 to master
2017-09-10 08:19:04 -07:00
artemp
40c51c469c
shape.input/shapeindex - update to use bounding box per item *.index format.
2017-08-21 11:02:34 +01:00
artemp
6c19efa990
store box2d<float> directly in index_record to avoid conversions.
2017-08-18 16:59:58 +01:00
artemp
d81a7610d3
shapeindex - make index node 32-bytes (uint64_t, int32_t, int32_t)
2017-08-18 16:58:20 +01:00
artemp
541c1a35a0
mapnik-index - initialise quad-tree with bbox if present.
2017-08-18 13:55:04 +01:00
artemp
94ef6170d8
mapnik-index - add experimental --bbox,-b option to limit index to provided bounding box e.g
...
```mapnik-index -b -5.51418,50.1944,-5.46256,50.2241 data.geojson```
2017-08-18 13:42:54 +01:00
artemp
2aa0ce9d74
New *.index format (bounding box per item) implementation
2017-08-18 11:16:44 +01:00
artemp
2426a44671
initial updated spatial-index implementation
2017-08-16 13:59:44 +01:00
artemp
add410e619
use arch independent types for serialised values
2017-08-15 11:14:11 +01:00
artemp
017d6cb540
cleanup
2017-06-29 09:41:16 +02:00
artemp
a6bc69359a
use SVG viewport as bounding box
2017-06-29 09:41:16 +02:00
artemp
0301399d40
svg2png - add short program options.
2017-06-29 09:41:16 +02:00
artemp
3f591af871
initial support for strict SVG parsing (WIP)
2017-06-29 09:41:16 +02:00
artemp
82a7d07b7f
return error code when no feature can be read from shapefile + update unit test.
2017-06-01 15:44:25 +02:00
artemp
333ef9fde1
update copyright year
2017-05-05 13:02:01 +02:00
artemp
8ff24d1193
Only log warning in --verbose mode.
2017-04-25 14:03:18 +02:00
Dane Springmeyer
7bd317a1bf
link -ldl last
2017-04-19 18:30:57 -07:00
Dane Springmeyer
359372d3b2
pgsql2sqlite:also link -ldl on linux
2017-04-19 18:10:25 -07:00
Dane Springmeyer
641d7b647f
consistently use pkg-config in both postgis plugin and pgsql2sqlite + use GDAL_CONFIG var in plugins
2017-03-28 15:18:48 -07:00
artemp
3eabd3141a
sync mapnik-index and shapeindex versions with mapnik via MAPNIK_VERSION_STRING
2017-02-27 13:22:55 +01:00
artemp
f85636f769
mapnik-index - log and return on invalid bounding box if validate_features is set.
2017-02-03 10:10:09 +01:00
artemp
f13848e210
move box2.hpp and related files into geometry dir
2017-01-26 09:51:37 +01:00
artemp
a108068cf6
fix remaning std::fread usage - check return value
2017-01-13 14:57:15 +01:00
artemp
d5405d55c7
use a copy of start iterator when extracting bounding boxes + increase verbose output on failures
2017-01-02 11:47:26 +01:00
artemp
0ec510025d
mapnik-index - remove -x3 option, use process_geojson_x3 always
2016-11-29 09:20:41 +01:00
artemp
c04d8bf082
re-enable GeoJSON feature validation
2016-11-25 17:50:33 +01:00
artemp
c5e44cc7a6
add missing extract_bounding_boxes_x3.cpp back
2016-11-25 17:16:13 +01:00
artemp
a40d4ee83f
Revert "move extract_bounding_boxes_x3 back into mapnik-json.a"
...
This reverts commit 44fc648cad
2016-11-25 17:01:01 +01:00
artemp
7decec426d
mapnik-index update build script
2016-11-25 16:52:19 +01:00
artemp
44fc648cad
move extract_bounding_boxes_x3 back into mapnik-json.a
2016-11-25 16:48:34 +01:00
artemp
a112e88e23
fix compilation - move extract_bounding_boxes into mapnik-index src dir
2016-11-23 17:44:35 +01:00
artemp
ed5ee69c3c
refactor GeoJSON bounding box extraction into separate method for re-use and more...
2016-11-23 16:18:38 +01:00
artemp
c2d7ecbef7
move keys_map initilizer with well-known-names into separate inline method
2016-11-15 17:23:27 +01:00
artemp
1b74544b08
start well-known-names enum from 1 + pre-initialise keys_map with well-known-names
2016-11-15 11:18:44 +01:00
artemp
1e238be7ee
move wkn_to_string to json_grammar_config.hpp
2016-11-15 10:15:10 +01:00
artemp
c860f9e465
add well_known_names to string mappings
2016-11-15 10:14:10 +01:00
artemp
0e9f06d221
more comprehensive validation implementation
2016-11-14 12:58:13 +01:00
artemp
92d35d1e40
fix json_value name clashing + add skeleton feature validation method
2016-11-14 12:18:36 +01:00
artemp
252a0366e9
consistent usage of iterator type + cleanups
2016-11-11 15:24:11 +01:00
artemp
99ce79fd36
allow short style syntax for long options e.g "-x3", "-validate-features" etc.
2016-11-11 10:48:03 +01:00
artemp
19f1af3861
mapnik-index - add optional 'fast' spirit::x3 GeoJSON parsing. Activated by "--x3" program option.
2016-11-11 10:40:52 +01:00
artemp
709d8409cc
Merge branch 'master' into develop-master
2016-10-17 09:47:00 +02:00
Bas Couwenberg
01699fe81e
Fix 'depedencies' typo, replace with 'dependencies'.
2016-10-15 20:07:52 +02:00
artemp
df12183e10
re-use object file to avoid duplicate compilation
2016-10-14 14:25:34 +02:00
artemp
8ce7a1c43d
refactor souce code files with the following rule: the physical filesytem path matches namespace structure
...
e.g `mapnik::geometry::centroid()` -> `$(MAPNIK_SOURCE)/include/mapnik/geometry/centroid.hpp`
2016-10-11 18:01:29 +02:00
Dane Springmeyer
02c2338c43
mapnik-config: strip clang specific warning flags
2016-08-31 11:09:11 -07:00
artemp
2864d90460
more explicit conversions to the target variant type
2016-07-25 13:45:35 +02:00
Mickey Rose
fc3d194ad2
missed svg2png when renaming svg_renderer_agg
2016-06-16 23:16:39 +02:00
Dane Springmeyer
fca1075fec
fix documentation for mapnik-render --open command - refs #3375 [skip ci]
2016-04-25 09:56:40 -07:00
artemp
9833bfb9ad
make opening rendered image an optional op ( ref #3374 )
2016-04-25 16:39:09 +02:00
artemp
1871e5f62d
return EXIT_FAILURE on invalid input ref #3410
2016-04-25 10:11:55 +02:00
artemp
2cbb9f480a
deduce box_type from T
2016-04-05 18:26:31 +02:00
artemp
7cd5301cbe
mapnik-index - refactor to use box2d<float> and reduce memory requirement during index creations
2016-03-24 17:12:16 +00:00
artemp
35190e81e0
rename open to is_open in utils/mapnik-index/process_geojson_file.cpp
2016-03-18 10:42:35 +01:00
Dane Springmeyer
087add2c71
Remove MAPNIK_BUNDLED_SHARE_DIRECTORY build option
...
- this was intended to be used by python-mapnik
- but it is not currently, so let's clean it up
- todo: get actual ICU_DATA,PROJ_LIB,GDAL_DATA values from those depependent libs
2016-03-16 13:48:26 -07:00
artemp
96b96c745d
Revert "csv_utils - check and skip processing lines consisting only of 0xa (windows) ( fixes #3359 )"
...
This reverts commit 9c09f15de9
2016-03-15 13:01:54 +01:00
artemp
9c09f15de9
csv_utils - check and skip processing lines consisting only of 0xa (windows) ( fixes #3359 )
2016-03-15 12:26:00 +01:00
Dane Springmeyer
89db790dda
rename parse_csv function to avoid confusion in inheritance
2016-03-11 14:23:16 -08:00
Dane Springmeyer
c715b142ec
suppress more third party warnings
2016-03-10 11:44:44 -08:00
Dane Springmeyer
57dbd77819
more warning_ignore usage - refs #2907
2016-03-09 16:43:00 -08:00
artemp
ff9cceeb9f
use platform specific macros as return codes (EXIT_SUCCESS/EXIT_FAILURE) + check if extent read from shapefile is valid and has valid width and heoght before creating an index.
2016-03-07 13:52:58 +01:00
Dane Springmeyer
833703026d
add COVERAGE configure option - only set coverage flags on libmapnik and plugins - refs #3344
2016-03-03 14:19:12 -08:00
Mickey Rose
c21778fdfc
merge mapnik-index::process_csv_file and csv_datasource::parse_csv
...
- the function in plugin was already configurable via flags, and only
contained two un-conditioned blocks that process_csv_file didn't have
- so I extracted the common parts into a separate function (in a class
holding the flags and state), process_csv_file calls it with default
flags, plugin sets them from params
- removed namespace ::detail, moving stuff that was used outside
csv_utils to ::csv_utils, and the rest to ::csv_utils::detail
2016-02-26 20:28:42 +01:00
Mickey Rose
aaffb1c771
don't #include .cpp, add it to sources
2016-02-25 11:58:38 +01:00
Dane Springmeyer
d1a4268eb6
remove unneeded includes - found with http://include-what-you-use.org
2016-02-24 22:39:50 -08:00
Dane Springmeyer
f2782d0b67
[csv] move spirit usage to cpp
2016-02-24 17:42:51 -08:00
Dane Springmeyer
8ffee05048
Merge branch 'master' of github.com:mapnik/mapnik into faster-csv-compile
2016-02-24 16:42:23 -08:00
artemp
b7dd8331df
use std::ofstream (ref 3300)
2016-02-18 12:54:17 +01:00
Dane Springmeyer
85d4596769
move getline impl to separate header to avoid as much spirit inclusion
2016-02-15 19:06:11 -08:00
