Skip to content

Commit

Permalink
track ABI changes upstream in mapnik master
Browse files Browse the repository at this point in the history
  • Loading branch information
Dane Springmeyer committed Mar 12, 2012
1 parent 3bbbb84 commit 2a0c92f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ For more sample code see 'examples/README.md'
## Depends

* Node >= v0.6.0
* Mapnik 2.1-dev (current master): (at least [9e397ae55](https://github.com/mapnik/mapnik/commit/9e397ae55e37e0e23477e523d03084790e23e264) / March 1, 2012)
* Mapnik 2.1-dev (current master): (at least [207ecfd597](https://github.com/mapnik/mapnik/commit/207ecfd597d70a9fcc1b3c8e768049658e4085fc) / March 12, 2012)


## Installation
Expand Down
16 changes: 8 additions & 8 deletions src/layer_emitter.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -30,29 +30,29 @@ static void layer_as_json(Local<Object> meta, const mapnik::layer & layer)
meta->Set(String::NewSymbol("srs"), String::New(layer.srs().c_str()));
}

if ( !layer.isActive())
if ( !layer.active())
{
meta->Set(String::NewSymbol("status"), Boolean::New(layer.isActive()));
meta->Set(String::NewSymbol("status"), Boolean::New(layer.active()));
}

if ( layer.clear_label_cache())
{
meta->Set(String::NewSymbol("clear_label_cache"), Boolean::New(layer.clear_label_cache()));
}

if ( layer.getMinZoom() )
if ( layer.min_zoom() > 0)
{
meta->Set(String::NewSymbol("minzoom"), Number::New(layer.getMinZoom()));
meta->Set(String::NewSymbol("minzoom"), Number::New(layer.min_zoom()));
}

if ( layer.getMaxZoom() != std::numeric_limits<double>::max() )
if ( layer.max_zoom() != std::numeric_limits<double>::max() )
{
meta->Set(String::NewSymbol("maxzoom"), Number::New(layer.getMaxZoom()));
meta->Set(String::NewSymbol("maxzoom"), Number::New(layer.max_zoom()));
}

if ( layer.isQueryable())
if ( layer.queryable())
{
meta->Set(String::NewSymbol("queryable"), Boolean::New(layer.isQueryable()));
meta->Set(String::NewSymbol("queryable"), Boolean::New(layer.queryable()));
}

std::vector<std::string> const& style_names = layer.styles();
Expand Down

0 comments on commit 2a0c92f

Please sign in to comment.