artemp
7f0e77d172
Merge branch 'master' into large-geojson
2015-01-23 18:12:33 +01:00
Dane Springmeyer
6ab91b2300
allow manually passing lib/include paths for libxml2 and freetype
2015-01-23 09:12:11 -08:00
Dane Springmeyer
ec111c8a27
add extra metadata to lyr desc + use for srid/keyfield in postgis - closes #2650
2015-01-22 18:44:56 -08:00
Blake Thompson
490645d2e3
Perhaps a solution to TIFF IO problems
2015-01-22 20:36:45 -06:00
Dane Springmeyer
fcdc826294
Add (currently failing) test for #2651
2015-01-22 18:25:37 -08:00
Dane Springmeyer
faddf1a615
fix compile of rasterlite plugin
2015-01-22 15:59:01 -08:00
Dane Springmeyer
4a1f4a9b5e
Use geometry_table_ rather than table_ for SRID lookup
...
- this will result in a faster query in the case that
the user provides an explicit geometry_table option
2015-01-22 15:55:30 -08:00
Blake Thompson
51172c8fdf
Move image_data.hpp to image.hpp and renamed most everything from image_data to image alone. This might lead to the need to clean up some variables that are currently named image through out the code at some time, but I think in the long term is much better as image is a better name for the base class.
2015-01-22 11:39:37 -06:00
Blake Thompson
e353225772
Modified the name of image_data_null to image_null.
2015-01-22 10:58:01 -06:00
artemp
58f770bf85
support BOOST_VERSION < 105600
2015-01-22 16:34:28 +01:00
artemp
e42d0deb61
correct types usage
2015-01-22 16:23:44 +01:00
artemp
2b82157127
cleanup
2015-01-22 16:21:01 +01:00
artemp
669d369e30
Merge branch 'master' into large-geojson
2015-01-22 16:12:14 +01:00
Blake Thompson
e01ce5b7d6
Changed image_data_gray* to image_gray* Ref #2633 .
2015-01-21 21:08:04 -06:00
Blake Thompson
22a384ef33
Moved image_data_rgba8 to image_rgba8. Ref #2633
2015-01-21 20:31:02 -06:00
Blake Thompson
e4a5424613
Merge branch 'release/image_data_any' of github.com:mapnik/mapnik into release/image_data_any
2015-01-21 19:40:23 -06:00
Blake Thompson
0f388ed68f
Changed the name of image_data_any to image_any. Moved header file for image_data_any to image_any. Ref #2633
2015-01-21 19:40:12 -06:00
Dane Springmeyer
82bc43c76f
fix stray include of graphics.hpp
2015-01-21 16:32:31 -08:00
Blake Thompson
93f835177b
Removed all the code for the previous type of image and image_32. Ref #2633
2015-01-21 17:57:16 -06:00
Blake Thompson
b57b1c12d6
Some smaller fixes that cause the proper operator to be called in visitor_create_marker. All tests now passing. Ref #2633
2015-01-21 17:09:53 -06:00
Dane Springmeyer
d6175adb1a
Update README.md
2015-01-21 14:28:12 -08:00
Dane Springmeyer
df9613369e
temp fix: copy rather than move image_data inside marker to avoid mutating marker
2015-01-20 20:38:22 -08:00
Dane Springmeyer
4856886284
fix compile of rundemo.cpp
2015-01-20 19:37:31 -08:00
Blake Thompson
9fda26f859
Merge branch 'release/image_data_any' of github.com:mapnik/mapnik into release/image_data_any
2015-01-20 18:33:50 -06:00
Blake Thompson
badb0c9a97
This is a complete removal of code that utilizes image_32 in the library. It is a sweeping change that does some of the following:
...
* Changes all agg_renderers to use a image_data_any variant (only image_data_rgba8 is implemented currently)
* Changes the marker and marker_cache to use image_data_any images
* Changes the symbolizers so that they must be aware of the source data type they are attempting to render and the render type that is expected to be rendered into.
* Moves many utilities into image_utils, that were previously in image_32.
The kicker is that this still isn't working perfectly yet, but I am commiting so I don't have tears in case everything is lost on my computer.
Ref #2633
2015-01-20 18:30:10 -06:00
Dane Springmeyer
97869f7dc1
minor include cleanup for image_utils
2015-01-20 09:06:21 -08:00
Blake Thompson
2439f1b298
A whole lot of changes. #Ref 2633
2015-01-20 10:48:33 -06:00
artemp
5a7a285216
extraxt_bounding_box_grammar - add generic json support to deal with arbitary key:value's in GeoJSON
2015-01-20 12:05:35 +01:00
artemp
9ba25cefe4
large_geojson - use 'C' style I/O for performance
2015-01-20 11:30:27 +01:00
artemp
9a74a55dd6
formatting
2015-01-20 11:29:58 +01:00
artemp
85cacfe378
use vector<char> as a buffer
2015-01-20 10:36:34 +01:00
artemp
bfe1d63ea0
debug : print total extent
2015-01-19 22:06:24 +01:00
artemp
a408a84fb0
ignore invalid bounding boxes from "geometry": null
2015-01-19 22:04:21 +01:00
artemp
1f693b8fa2
larger_geojson - store {offset, size} in spatial index and remove multi_pass requirement
...
TODO: try std::fread instead of ifstream, use std::vector<uint8_t> instead of std::string
2015-01-19 18:10:59 +01:00
artemp
15a83ff54d
extract bounding boxes from GeoJSON - re-implement grammar to store offset and size of "Feature" elements
2015-01-19 18:09:23 +01:00
Blake Thompson
aa03cf4f7c
Implemented a new get_pixel method to go along with the set_pixel method in image_util. Ref #2633
2015-01-16 22:15:33 -06:00
Blake Thompson
a002139e18
Added set_pixel to visitor pattern and moved it to image_util. Added exception throwing in composite only if debug flags are on.
...
Ref #2633
2015-01-16 18:26:56 -06:00
Blake Thompson
1470bea9cb
Migrated composite_pixel out of image_32, it is now in image_utils. Ref #2633
2015-01-16 16:48:43 -06:00
Blake Thompson
0b2c4e57cf
Merge_rectangle has met the wood chipper. Ref #2633
2015-01-16 16:04:02 -06:00
Blake Thompson
a7b8ca2888
Moved set_rectangle out of image_32 into image_util.
...
Ref #2633
2015-01-16 15:36:53 -06:00
Blake Thompson
35be6117c8
Merge branch 'master' into release/image_data_any
2015-01-16 13:09:25 -06:00
Blake Thompson
aebb6fee58
Removed the background and set/get background from image_32 class. Removed clear method from image_32. Added new fill method for image_data_any, that allows many generic types to fill an image.
...
Ref #2633
2015-01-16 13:06:52 -06:00
artemp
f50a34d1b8
use boost::spirit::iterator_policies::first_owner in multi_pass
2015-01-16 17:54:04 +01:00
artemp
da02dc40c2
sort index array by offsets
2015-01-16 17:19:59 +01:00
artemp
b15224af1b
add <iomanip> for std::setprecision
2015-01-16 17:19:17 +01:00
artemp
0c280b5066
reduce verbosity
2015-01-16 16:41:38 +01:00
artemp
da960fea33
use std::advance to work with std::iterators
2015-01-16 16:40:28 +01:00
artemp
b6cd3b37ef
store {bbox, offset} to match boost.geometry rtree instantiation
2015-01-16 16:24:31 +01:00
artemp
788fd8c80b
large_geojson.input - initial implementation
2015-01-16 16:22:46 +01:00
artemp
8b19793dc8
fix grammar (use iter_pos parser instead of hacking raw[] directive) + cleanups
2015-01-16 10:05:02 +01:00
