Commit graph

9398 commits

Author SHA1 Message Date
artemp
1263bc9c2e merge large geojson plug-in into geojson.input 2015-01-26 10:19:18 +01:00
artemp
44905ffc43 geojson.input - use adapted box2d<double> as box_type + make spatial index compatible with large_geojson 2015-01-26 09:42:06 +01:00
artemp
d45b9db86e remove unused include directives 2015-01-26 09:41:20 +01:00
artemp
2f42cb91cc Merge branch 'master' into large-geojson 2015-01-26 09:16:06 +01:00
Dane Springmeyer
8d6b70ea70 bootstrap: split build time and runtime settings 2015-01-24 10:18:32 -08:00
Dane Springmeyer
80a141da78 config.py generation fixups 2015-01-24 10:10:07 -08:00
Dane Springmeyer
c69b4b1151 fix mason dir check 2015-01-24 10:07:26 -08:00
Dane Springmeyer
3e8b701194 bootstrap cleanups 2015-01-24 10:05:58 -08:00
Dane Springmeyer
93570f820a mason bootstrap: expat and sqlite_rtree fixes 2015-01-24 08:51:16 -08:00
Dane Springmeyer
d930265467 mason bootstrap: ensure clang finds correct gcc-4.8 lib 2015-01-24 08:42:05 -08:00
Dane Springmeyer
2652649ea0 scons: fix sqlite_rtree linux configure test in absence of pkg-config 2015-01-24 08:41:06 -08:00
Dane Springmeyer
e26132cf9f travis cleanup 2015-01-23 23:51:54 -08:00
Dane Springmeyer
6344b24193 travis: disable benchmarks, install nose 2015-01-23 23:29:24 -08:00
Dane Springmeyer
1a28cf763f use clang 2015-01-23 23:05:41 -08:00
Dane Springmeyer
3ba834109a debug configure fail 2015-01-23 23:01:08 -08:00
Dane Springmeyer
be1690d5c7 try sudoless clang upgrade 2015-01-23 22:57:45 -08:00
Dane Springmeyer
bdc49e2adb fix mason setup 2015-01-23 21:44:32 -08:00
Dane Springmeyer
03192c5f2a fix bash syntax 2015-01-23 20:42:03 -08:00
Dane Springmeyer
e53f4e8637 sudoless 2015-01-23 14:21:54 -08:00
Dane Springmeyer
34b685db40 travis: try bootstraping deps with mason 2015-01-23 14:04:41 -08:00
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
Dane Springmeyer
fcdc826294 Add (currently failing) test for #2651 2015-01-22 18:25:37 -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
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
Dane Springmeyer
d6175adb1a Update README.md 2015-01-21 14:28:12 -08: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
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
artemp
785cf5c09f extract_bounding_box grammar initial impl 2015-01-16 09:48:57 +01:00
Dane Springmeyer
39d8d65343 Merge pull request #2642 from mapnik/group-markers
Support MarkersSymbolizer in GroupSymbolizer
2015-01-14 18:58:27 -08:00
Dane Springmeyer
b55d5def0d sync with latest master/3.x 2015-01-14 18:35:40 -08:00
Blake Thompson
e04b0617e7 Added myself to authors
What a self promoting bastard.
2015-01-13 13:34:03 -06:00