sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge remote-tracking branch 'origin' into spirit-x3

Browse source
This commit is contained in:
artemp 2016-01-22 16:52:15 +01:00
commit 049382a961
4 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
deps/mapbox/variant vendored

@ -1 +1 @@
Subproject commit 861faa8125ae7c2d9e41e33b3d5d97a17213c415
Subproject commit 272f91c0962f001021e35811d9bf934fcb2476f4

1
src/memory_datasource.cpp
View file

@ -132,6 +132,7 @@ featureset_ptr memory_datasource::features_at_point(coord2d const& pt, double to
void memory_datasource::set_envelope(box2d<double> const& box)
{
extent_ = box;
dirty_extent_ = false;
}
box2d<double> memory_datasource::envelope() const

2
test/data

@ -1 +1 @@
Subproject commit 2448353f8e4e142ccaae35e155503b2cb88eb344
Subproject commit 24844dead6d23fd541aba147b69703a605fc7351

2
test/data-visual

@ -1 +1 @@
Subproject commit c2b3f12c3620dde8310315a21c0b952fd62c490a
Subproject commit f5623b5a312c58cd9c1926008fcf114944c769a3