From 7e934215ff52e017ad5d65e76d5e8365caae1ace Mon Sep 17 00:00:00 2001 From: Artem Pavlenko Date: Wed, 10 Feb 2021 11:49:25 +0000 Subject: [PATCH 01/95] proj6 - WIP --- src/mapnik_map.cpp | 6 +-- src/mapnik_projection.cpp | 12 ++--- src/mapnik_vector_tile_composite.cpp | 4 +- src/mapnik_vector_tile_image.cpp | 8 +-- src/mapnik_vector_tile_json.cpp | 8 +-- src/mapnik_vector_tile_query.cpp | 8 +-- src/mapnik_vector_tile_simple_valid.cpp | 4 +- test/data/postgis_datasource_tokens_query.xml | 4 +- .../vector_tile/compositing/layers/lines.xml | 6 +-- .../vector_tile/compositing/layers/points.xml | 6 +-- test/data/vector_tile/pasted/pasted11.xml | 2 +- test/data/vector_tile/pasted/pasted12.xml | 2 +- test/data/vector_tile/pasted/pasted13.xml | 2 +- test/data/vector_tile/pasted/pasted14.xml | 2 +- test/data/vector_tile/pasted/pasted17.xml | 2 +- test/datasource.test.js | 2 +- test/feature.test.js | 8 +-- test/layers.test.js | 6 +-- test/map.test.js | 10 ++-- test/proj_transform.test.js | 50 +++++++++---------- test/projection.test.js | 16 +++--- test/support/composites.xml | 8 +-- test/vector-tile.test.js | 4 +- 23 files changed, 90 insertions(+), 90 deletions(-) diff --git a/src/mapnik_map.cpp b/src/mapnik_map.cpp index f703709fa9..acb823353d 100644 --- a/src/mapnik_map.cpp +++ b/src/mapnik_map.cpp @@ -85,7 +85,7 @@ Napi::Object Map::Initialize(Napi::Env env, Napi::Object exports, napi_property_ * @param {int} width in pixels * @param {int} height in pixels * @param {string} [projection='+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'] projection as a proj4 code - * typically used with '+init=epsg:3857' + * typically used with 'epsg:3857' * @property {string} src * @property {number} width * @property {number} height @@ -97,7 +97,7 @@ Napi::Object Map::Initialize(Napi::Env env, Napi::Object exports, napi_property_ * @property {} parameters * @property {} aspect_fix_mode * @example - * var map = new mapnik.Map(600, 400, '+init=epsg:3857'); + * var map = new mapnik.Map(600, 400, 'epsg:3857'); * console.log(map); * // { * // aspect_fix_mode: 0, @@ -113,7 +113,7 @@ Napi::Object Map::Initialize(Napi::Env env, Napi::Object exports, napi_property_ * // bufferSize: 0, * // height: 400, * // width: 600, - * // srs: '+init=epsg:3857' + * // srs: 'epsg:3857' * // } */ diff --git a/src/mapnik_projection.cpp b/src/mapnik_projection.cpp index fd4b49b3ba..0ba7612e3b 100644 --- a/src/mapnik_projection.cpp +++ b/src/mapnik_projection.cpp @@ -36,7 +36,7 @@ Napi::Object Projection::Initialize(Napi::Env env, Napi::Object exports, napi_pr * @throws {Error} the projection could not be initialized - it was not found * in proj4's tables or the string was malformed * @example - * var wgs84 = new mapnik.Projection('+init=epsg:4326'); + * var wgs84 = new mapnik.Projection('epsg:4326'); */ Projection::Projection(Napi::CallbackInfo const& info) @@ -87,7 +87,7 @@ Projection::Projection(Napi::CallbackInfo const& info) * @param {Array} position as [x, y] or extent as [minx,miny,maxx,maxy] * @returns {Array} projected coordinates * @example - * var merc = new mapnik.Projection('+init=epsg:3857'); + * var merc = new mapnik.Projection('epsg:3857'); * var long_lat_coords = [-122.33517, 47.63752]; * var projected = merc.forward(long_lat_coords); */ @@ -315,7 +315,7 @@ Napi::Value ProjTransform::forward(Napi::CallbackInfo const& info) { std::ostringstream s; s << "Failed to forward project " - << x << "," << y << " from " << proj_transform_->source().params() << " to " << proj_transform_->dest().params(); + << x << "," << y << " " << proj_transform_->definition(); Napi::Error::New(env, s.str().c_str()).ThrowAsJavaScriptException(); return env.Undefined(); } @@ -334,7 +334,7 @@ Napi::Value ProjTransform::forward(Napi::CallbackInfo const& info) { std::ostringstream s; s << "Failed to forward project " - << box << " from " << proj_transform_->source().params() << " to " << proj_transform_->dest().params(); + << box << " " << proj_transform_->definition(); Napi::Error::New(env, s.str()).ThrowAsJavaScriptException(); return env.Undefined(); } @@ -385,7 +385,7 @@ Napi::Value ProjTransform::backward(Napi::CallbackInfo const& info) { std::ostringstream s; s << "Failed to back project " - << x << "," << y << " from " << proj_transform_->dest().params() << " to: " << proj_transform_->source().params(); + << x << "," << y << " " << proj_transform_->definition(); Napi::Error::New(env, s.str()).ThrowAsJavaScriptException(); return env.Null(); } @@ -404,7 +404,7 @@ Napi::Value ProjTransform::backward(Napi::CallbackInfo const& info) { std::ostringstream s; s << "Failed to back project " - << box << " from " << proj_transform_->source().params() << " to " << proj_transform_->dest().params(); + << box << " " << proj_transform_->definition(); Napi::Error::New(env, s.str()).ThrowAsJavaScriptException(); return env.Null(); } diff --git a/src/mapnik_vector_tile_composite.cpp b/src/mapnik_vector_tile_composite.cpp index c967a4c555..08e5428582 100644 --- a/src/mapnik_vector_tile_composite.cpp +++ b/src/mapnik_vector_tile_composite.cpp @@ -23,7 +23,7 @@ void _composite(tile_type target_tile, std::launch threading_mode) { // create map - mapnik::Map map(target_tile->size(), target_tile->size(), "+init=epsg:3857"); + mapnik::Map map(target_tile->size(), target_tile->size(), "epsg:3857"); if (max_extent) { map.set_maximum_extent(*max_extent); @@ -575,7 +575,7 @@ Napi::Value VectorTile::composite(Napi::CallbackInfo const& info) std::string image_format = "webp"; mapnik::scaling_method_e scaling_method = mapnik::SCALING_BILINEAR; std::launch threading_mode = std::launch::deferred; - std::string merc_srs("+init=epsg:3857"); + std::string merc_srs("epsg:3857"); if (info.Length() > 2) { diff --git a/src/mapnik_vector_tile_image.cpp b/src/mapnik_vector_tile_image.cpp index 254a39f5c1..2c62a6a516 100644 --- a/src/mapnik_vector_tile_image.cpp +++ b/src/mapnik_vector_tile_image.cpp @@ -127,8 +127,8 @@ Napi::Value VectorTile::addImageSync(Napi::CallbackInfo const& info) try { // create map object - mapnik::Map map(tile_->size(), tile_->size(), "+init=epsg:3857"); - mapnik::layer lyr(layer_name, "+init=epsg:3857"); + mapnik::Map map(tile_->size(), tile_->size(), "epsg:3857"); + mapnik::layer lyr(layer_name, "epsg:3857"); lyr.set_datasource(ds); map.add_layer(lyr); @@ -178,8 +178,8 @@ struct AsyncAddImage : Napi::AsyncWorker ds->envelope(); // can be removed later, currently doesn't work with out this. ds->set_envelope(tile_->extent()); // create map object - mapnik::Map map(tile_->size(), tile_->size(), "+init=epsg:3857"); - mapnik::layer lyr(layer_name_, "+init=epsg:3857"); + mapnik::Map map(tile_->size(), tile_->size(), "epsg:3857"); + mapnik::layer lyr(layer_name_, "epsg:3857"); lyr.set_datasource(ds); map.add_layer(lyr); diff --git a/src/mapnik_vector_tile_json.cpp b/src/mapnik_vector_tile_json.cpp index 9cbc2a14f5..729646d3da 100644 --- a/src/mapnik_vector_tile_json.cpp +++ b/src/mapnik_vector_tile_json.cpp @@ -319,8 +319,8 @@ bool layer_to_geojson(protozero::pbf_reader const& layer, unsigned z) { mapnik::vector_tile_impl::tile_datasource_pbf ds(layer, x, y, z); - mapnik::projection wgs84("+init=epsg:4326", true); - mapnik::projection merc("+init=epsg:3857", true); + mapnik::projection wgs84("epsg:4326", true); + mapnik::projection merc("epsg:3857", true); mapnik::proj_transform prj_trans(merc, wgs84); // This mega box ensures we capture all features, including those // outside the tile extent. Geometries outside the tile extent are @@ -1095,11 +1095,11 @@ Napi::Value VectorTile::addGeoJSON(Napi::CallbackInfo const& info) { // create map object auto tile_size = tile_->tile_size(); - mapnik::Map map(tile_size, tile_size, "+init=epsg:3857"); + mapnik::Map map(tile_size, tile_size, "epsg:3857"); mapnik::parameters p; p["type"] = "geojson"; p["inline"] = geojson_string; - mapnik::layer lyr(geojson_name, "+init=epsg:4326"); + mapnik::layer lyr(geojson_name, "epsg:4326"); lyr.set_datasource(mapnik::datasource_cache::instance().create(p)); map.add_layer(lyr); diff --git a/src/mapnik_vector_tile_query.cpp b/src/mapnik_vector_tile_query.cpp index 340277e9cc..7d3c12e7ca 100644 --- a/src/mapnik_vector_tile_query.cpp +++ b/src/mapnik_vector_tile_query.cpp @@ -175,8 +175,8 @@ std::vector _query(mapnik::vector_tile_impl::merc_tile_ptr const& return arr; } - mapnik::projection wgs84("+init=epsg:4326", true); - mapnik::projection merc("+init=epsg:3857", true); + mapnik::projection wgs84("epsg:4326", true); + mapnik::projection merc("epsg:3857", true); mapnik::proj_transform tr(wgs84, merc); double x = lon; double y = lat; @@ -385,8 +385,8 @@ void _queryMany(queryMany_result& result, // Reproject query => mercator points mapnik::box2d bbox; - mapnik::projection wgs84("+init=epsg:4326", true); - mapnik::projection merc("+init=epsg:3857", true); + mapnik::projection wgs84("epsg:4326", true); + mapnik::projection merc("epsg:3857", true); mapnik::proj_transform tr(wgs84, merc); std::vector points; points.reserve(query.size()); diff --git a/src/mapnik_vector_tile_simple_valid.cpp b/src/mapnik_vector_tile_simple_valid.cpp index 687dfaabde..be5e95f37f 100644 --- a/src/mapnik_vector_tile_simple_valid.cpp +++ b/src/mapnik_vector_tile_simple_valid.cpp @@ -371,8 +371,8 @@ void layer_not_valid(protozero::pbf_reader& layer_msg, { if (lat_lon) { - mapnik::projection wgs84("+init=epsg:4326", true); - mapnik::projection merc("+init=epsg:3857", true); + mapnik::projection wgs84("epsg:4326", true); + mapnik::projection merc("epsg:3857", true); mapnik::proj_transform prj_trans(merc, wgs84); unsigned int n_err = 0; mapnik::util::apply_visitor( diff --git a/test/data/postgis_datasource_tokens_query.xml b/test/data/postgis_datasource_tokens_query.xml index b877e217ee..fc896cd619 100644 --- a/test/data/postgis_datasource_tokens_query.xml +++ b/test/data/postgis_datasource_tokens_query.xml @@ -1,6 +1,6 @@ - - + + postgis localhost diff --git a/test/data/vector_tile/compositing/layers/lines.xml b/test/data/vector_tile/compositing/layers/lines.xml index 5380899ce9..fe4489e70e 100755 --- a/test/data/vector_tile/compositing/layers/lines.xml +++ b/test/data/vector_tile/compositing/layers/lines.xml @@ -6,7 +6,7 @@ - + lines csv @@ -17,5 +17,5 @@ wkt - - \ No newline at end of file + + diff --git a/test/data/vector_tile/compositing/layers/points.xml b/test/data/vector_tile/compositing/layers/points.xml index 716afd6ac6..15602627bb 100755 --- a/test/data/vector_tile/compositing/layers/points.xml +++ b/test/data/vector_tile/compositing/layers/points.xml @@ -6,7 +6,7 @@ - + points csv @@ -15,5 +15,5 @@ x,y 0,0 - - \ No newline at end of file + + diff --git a/test/data/vector_tile/pasted/pasted11.xml b/test/data/vector_tile/pasted/pasted11.xml index 59955b3de7..aba9fc3b47 100644 --- a/test/data/vector_tile/pasted/pasted11.xml +++ b/test/data/vector_tile/pasted/pasted11.xml @@ -7,7 +7,7 @@ - + style pasted11.shp diff --git a/test/data/vector_tile/pasted/pasted12.xml b/test/data/vector_tile/pasted/pasted12.xml index f64dbf2c29..2752818641 100644 --- a/test/data/vector_tile/pasted/pasted12.xml +++ b/test/data/vector_tile/pasted/pasted12.xml @@ -7,7 +7,7 @@ - + style pasted12.geojson diff --git a/test/data/vector_tile/pasted/pasted13.xml b/test/data/vector_tile/pasted/pasted13.xml index 11ade49e37..281cd70520 100644 --- a/test/data/vector_tile/pasted/pasted13.xml +++ b/test/data/vector_tile/pasted/pasted13.xml @@ -7,7 +7,7 @@ - + style pasted13.geojson diff --git a/test/data/vector_tile/pasted/pasted14.xml b/test/data/vector_tile/pasted/pasted14.xml index a76cedf360..ec6594e4b5 100644 --- a/test/data/vector_tile/pasted/pasted14.xml +++ b/test/data/vector_tile/pasted/pasted14.xml @@ -7,7 +7,7 @@ - + style pasted14.geojson diff --git a/test/data/vector_tile/pasted/pasted17.xml b/test/data/vector_tile/pasted/pasted17.xml index b516970ebd..56a98571b4 100644 --- a/test/data/vector_tile/pasted/pasted17.xml +++ b/test/data/vector_tile/pasted/pasted17.xml @@ -7,7 +7,7 @@ - + style pasted17.geojson diff --git a/test/datasource.test.js b/test/datasource.test.js index 50f4c948f1..6e373bea65 100644 --- a/test/datasource.test.js +++ b/test/datasource.test.js @@ -233,7 +233,7 @@ test('should validate with raster', (assert) => { assert.deepEqual(expected,describe); // Test that if added to layer, can get datasource back - var layer = new mapnik.Layer('foo', '+init=epsg:4326'); + var layer = new mapnik.Layer('foo', 'epsg:4326'); layer.datasource = ds; var ds2 = layer.datasource; assert.ok(ds2); diff --git a/test/feature.test.js b/test/feature.test.js index 656d809d0e..a5a142c5ad 100644 --- a/test/feature.test.js +++ b/test/feature.test.js @@ -184,8 +184,8 @@ test('should be able to create feature from geojson and turn back into geojson', assert.deepEqual(geom.extent(),[ 1, 1, 2, 2 ]); var expected_geom = JSON.stringify(expected.geometry); assert.equal(expected_geom,geom.toJSON()); - var source_proj = new mapnik.Projection('+init=epsg:4326'); - var dest_proj = new mapnik.Projection('+init=epsg:3857'); + var source_proj = new mapnik.Projection('epsg:4326'); + var dest_proj = new mapnik.Projection('epsg:3857'); var trans = new mapnik.ProjTransform(source_proj,dest_proj); var transformed = geom.toJSON({transform:trans}); assert.notEqual(expected_geom,transformed); @@ -264,8 +264,8 @@ test('should be able to reproject geojson feature', (assert) => { assert.ok(Math.abs(ext[0] - expected_ext[0]) < 0.001); var input_geom = JSON.stringify(input.geometry); assert.equal(input_geom,geom.toJSON()); - var dest_proj = new mapnik.Projection('+init=epsg:4326'); - var source_proj = new mapnik.Projection('+init=epsg:3857'); + var dest_proj = new mapnik.Projection('epsg:4326'); + var source_proj = new mapnik.Projection('epsg:3857'); var trans = new mapnik.ProjTransform(source_proj,dest_proj); var expected_transformed = { "type": "MultiPolygon", diff --git a/test/layers.test.js b/test/layers.test.js index dd8bcbaf8d..95890c04ce 100644 --- a/test/layers.test.js +++ b/test/layers.test.js @@ -18,7 +18,7 @@ test('should throw with invalid usage', (assert) => { test('should initialize properly', (assert) => { mapnik.register_datasource(path.join(mapnik.settings.paths.input_plugins,'shape.input')); - var layer = new mapnik.Layer('foo', '+init=epsg:4326'); + var layer = new mapnik.Layer('foo', 'epsg:4326'); assert.equal(layer.name, 'foo'); layer.active = true; assert.equal(layer.active, true); @@ -40,7 +40,7 @@ test('should initialize properly', (assert) => { assert.throws(function() { layer.maximum_scale_denominator = null; }); assert.throws(function() { layer.queryable = null; }); assert.throws(function() { layer.clear_label_cache = null; }); - assert.equal(layer.srs, '+init=epsg:4326'); + assert.equal(layer.srs, 'epsg:4326'); assert.deepEqual(layer.styles, []); // will be empty/undefined assert.ok(!layer.datasource); @@ -61,7 +61,7 @@ test('should initialize properly', (assert) => { assert.equal(meta.queryable, false); assert.equal(meta.clear_label_cache, false); assert.equal(meta.name, 'foo'); - assert.equal(meta.srs, '+init=epsg:4326'); + assert.equal(meta.srs, 'epsg:4326'); assert.deepEqual(meta.styles, []); assert.deepEqual(meta.datasource, options); assert.end(); diff --git a/test/map.test.js b/test/map.test.js index 57873dc463..3aaaa253e4 100644 --- a/test/map.test.js +++ b/test/map.test.js @@ -33,9 +33,9 @@ test('should be initialized properly', (assert) => { test('should be initialized properly with projection', (assert) => { // TODO - more tests - var map = new mapnik.Map(25,25,'+init=epsg:3857'); + var map = new mapnik.Map(25,25,'epsg:3857'); assert.ok(map instanceof mapnik.Map); - assert.equal(map.srs, '+init=epsg:3857'); + assert.equal(map.srs, 'epsg:3857'); assert.end(); }); @@ -102,8 +102,8 @@ test('should have settable properties', (assert) => { assert.equal(map.srs, "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs"); assert.throws(function() { map.srs = 100; }); - map.srs = '+init=epsg:3857'; - assert.equal(map.srs, '+init=epsg:3857'); + map.srs = 'epsg:3857'; + assert.equal(map.srs, 'epsg:3857'); // Test Parameters assert.throws(function() { map.parameters = null; }); @@ -388,7 +388,7 @@ test('should allow access to layers', (assert) => { // make a change to layer, ensure it sticks layer.name = 'a'; layer.styles = ['a']; - layer.srs = '+init=epsg:4326'; + layer.srs = 'epsg:4326'; layer.datasource = new mapnik.Datasource(options); // Assert that add layer throws for bad layers diff --git a/test/proj_transform.test.js b/test/proj_transform.test.js index 492b3fe5e2..2f0d555001 100644 --- a/test/proj_transform.test.js +++ b/test/proj_transform.test.js @@ -4,7 +4,7 @@ var test = require('tape'); var mapnik = require('../'); test('should throw with invalid usage', (assert) => { - assert.throws(function() { new mapnik.ProjTransform('+init=epsg:foo'); }); + assert.throws(function() { new mapnik.ProjTransform('epsg:foo'); }); assert.throws(function() { new mapnik.ProjTransform('+proj +foo'); }); assert.throws(function() { new mapnik.ProjTransform(1,1); }); assert.throws(function() { new mapnik.ProjTransform({},{}); }); @@ -21,8 +21,8 @@ test('should not initialize properly', (assert) => { }); test('should initialize properly', (assert) => { - var wgs84 = new mapnik.Projection('+init=epsg:4326'); - var wgs84_2 = new mapnik.Projection('+init=epsg:4326'); + var wgs84 = new mapnik.Projection('epsg:4326'); + var wgs84_2 = new mapnik.Projection('epsg:4326'); var trans = new mapnik.ProjTransform(wgs84,wgs84_2); assert.ok(trans); assert.equal(trans instanceof mapnik.ProjTransform, true); @@ -30,8 +30,8 @@ test('should initialize properly', (assert) => { }); test('should forward coords properly (no-op)', (assert) => { - var wgs84 = new mapnik.Projection('+init=epsg:4326'); - var wgs84_2 = new mapnik.Projection('+init=epsg:4326'); + var wgs84 = new mapnik.Projection('epsg:4326'); + var wgs84_2 = new mapnik.Projection('epsg:4326'); var trans = new mapnik.ProjTransform(wgs84,wgs84_2); var long_lat_coords = [-122.33517, 47.63752]; assert.deepEqual(long_lat_coords,trans.forward(long_lat_coords)); @@ -39,8 +39,8 @@ test('should forward coords properly (no-op)', (assert) => { }); test('should forward coords properly (no-op)', (assert) => { - var wgs84 = new mapnik.Projection('+init=epsg:4326'); - var wgs84_2 = new mapnik.Projection('+init=epsg:4326'); + var wgs84 = new mapnik.Projection('epsg:4326'); + var wgs84_2 = new mapnik.Projection('epsg:4326'); var trans = new mapnik.ProjTransform(wgs84,wgs84_2); var long_lat_box = [-122.33517, 47.63752,-122.33517, 47.63752]; assert.deepEqual(long_lat_box,trans.forward(long_lat_box)); @@ -48,8 +48,8 @@ test('should forward coords properly (no-op)', (assert) => { }); test('should forward coords properly (4326 -> 3857)', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326'); - var to = new mapnik.Projection('+init=epsg:3857'); + var from = new mapnik.Projection('epsg:4326'); + var to = new mapnik.Projection('epsg:3857'); var trans = new mapnik.ProjTransform(from,to); var long_lat_coords = [-122.33517, 47.63752]; var merc = [-13618288.8305, 6046761.54747]; @@ -58,8 +58,8 @@ test('should forward coords properly (4326 -> 3857)', (assert) => { }); test('should forward coords properly (4326 -> 3857) - no init proj4', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326', {lazy:true}); - var to = new mapnik.Projection('+init=epsg:3857', {lazy:true}); + var from = new mapnik.Projection('epsg:4326', {lazy:true}); + var to = new mapnik.Projection('epsg:3857', {lazy:true}); var trans = new mapnik.ProjTransform(from,to); var long_lat_coords = [-122.33517, 47.63752]; var merc = [-13618288.8305, 6046761.54747]; @@ -68,8 +68,8 @@ test('should forward coords properly (4326 -> 3857) - no init proj4', (assert) = }); test('should backward coords properly (3857 -> 4326)', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326'); - var to = new mapnik.Projection('+init=epsg:3857'); + var from = new mapnik.Projection('epsg:4326'); + var to = new mapnik.Projection('epsg:3857'); var trans = new mapnik.ProjTransform(from,to); var long_lat_coords = [-122.33517, 47.63752]; var merc = [-13618288.8305, 6046761.54747]; @@ -78,8 +78,8 @@ test('should backward coords properly (3857 -> 4326)', (assert) => { }); test('should throw with invalid coords (4326 -> 3873)', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326'); - var to = new mapnik.Projection('+init=epsg:3873'); + var from = new mapnik.Projection('epsg:4326'); + var to = new mapnik.Projection('epsg:3873'); var trans = new mapnik.ProjTransform(from,to); var long_lat_coords = [-190, 95]; assert.throws(function() { trans.forward(); }); @@ -90,8 +90,8 @@ test('should throw with invalid coords (4326 -> 3873)', (assert) => { }); test('should throw with invalid coords (3873 -> 4326) backward', (assert) => { - var from = new mapnik.Projection('+init=epsg:3873'); - var to = new mapnik.Projection('+init=epsg:4326'); + var from = new mapnik.Projection('epsg:3873'); + var to = new mapnik.Projection('epsg:4326'); var trans = new mapnik.ProjTransform(from,to); var long_lat_coords = [-190, 95]; assert.throws(function() { trans.backward(); }); @@ -102,8 +102,8 @@ test('should throw with invalid coords (3873 -> 4326) backward', (assert) => { }); test('should forward bbox properly (4326 -> 3857)', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326'); - var to = new mapnik.Projection('+init=epsg:3857'); + var from = new mapnik.Projection('epsg:4326'); + var to = new mapnik.Projection('epsg:3857'); var trans = new mapnik.ProjTransform(from,to); var long_lat_box = [-131.3086, 16.8045, -61.6992, 54.6738]; var merc = [-14617205.7910, 1898084.2861, -6868325.6126, 7298818.9559]; @@ -112,8 +112,8 @@ test('should forward bbox properly (4326 -> 3857)', (assert) => { }); test('should backward bbox properly (3857 -> 4326)', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326'); - var to = new mapnik.Projection('+init=epsg:3857'); + var from = new mapnik.Projection('epsg:4326'); + var to = new mapnik.Projection('epsg:3857'); var trans = new mapnik.ProjTransform(from,to); var long_lat_box = [-131.3086, 16.8045, -61.6992, 54.6738]; var merc = [-14617205.7910, 1898084.2861, -6868325.6126, 7298818.9559]; @@ -122,8 +122,8 @@ test('should backward bbox properly (3857 -> 4326)', (assert) => { }); test('should throw with invalid bbox (4326 -> 3873)', (assert) => { - var from = new mapnik.Projection('+init=epsg:4326'); - var to = new mapnik.Projection('+init=epsg:3873'); + var from = new mapnik.Projection('epsg:4326'); + var to = new mapnik.Projection('epsg:3873'); var trans = new mapnik.ProjTransform(from,to); var long_lat_box = [-180,90,180,90]; assert.throws(function() { trans.forward(long_lat_box); }); @@ -131,8 +131,8 @@ test('should throw with invalid bbox (4326 -> 3873)', (assert) => { }); test('should throw with invalid bbox (3873 -> 4326) backward', (assert) => { - var from = new mapnik.Projection('+init=epsg:3873'); - var to = new mapnik.Projection('+init=epsg:4326'); + var from = new mapnik.Projection('epsg:3873'); + var to = new mapnik.Projection('epsg:4326'); var trans = new mapnik.ProjTransform(from,to); var long_lat_box = [-180,90,180,90]; assert.throws(function() { trans.backward(long_lat_box); }); diff --git a/test/projection.test.js b/test/projection.test.js index f6750acc1e..6ed02f3f00 100644 --- a/test/projection.test.js +++ b/test/projection.test.js @@ -5,28 +5,28 @@ var mapnik = require('../'); test('should throw with invalid usage', (assert) => { - assert.throws(function() { mapnik.Projection('+init=epsg:foo'); } ); - assert.throws(function() { new mapnik.Projection('+init=epsg:foo'); } ); + assert.throws(function() { mapnik.Projection('epsg:foo'); } ); + assert.throws(function() { new mapnik.Projection('epsg:foo'); } ); assert.throws(function() { new mapnik.Projection('+proj +foo'); } ); assert.throws(function() { new mapnik.Projection(1); }); assert.throws(function() { new mapnik.Projection({}); }); - assert.throws(function() { new mapnik.Projection('+init=epsg:3857', null); } ); - assert.throws(function() { new mapnik.Projection('+init=epsg:3857', {lazy:null}); } ); + assert.throws(function() { new mapnik.Projection('epsg:3857', null); } ); + assert.throws(function() { new mapnik.Projection('epsg:3857', {lazy:null}); } ); assert.end(); }); test('should initialize properly', (assert) => { - var wgs84 = new mapnik.Projection('+init=epsg:4326'); + var wgs84 = new mapnik.Projection('epsg:4326'); assert.equal(wgs84 instanceof mapnik.Projection, true); var merc; try { // perhaps we've got a savvy user? - merc = new mapnik.Projection('+init=epsg:900913'); + merc = new mapnik.Projection('epsg:900913'); } catch (err) { // newer versions of proj4 have this code which is == 900913 - merc = new mapnik.Projection('+init=epsg:3857'); + merc = new mapnik.Projection('epsg:3857'); } assert.equal(merc instanceof mapnik.Projection, true, @@ -59,7 +59,7 @@ test('should initialize properly', (assert) => { }); test('should fail some methods with an uninitialized projection', (assert) => { - var wgs84 = new mapnik.Projection('+init=epsg:4326', {lazy : true}); + var wgs84 = new mapnik.Projection('epsg:4326', {lazy : true}); assert.equal(wgs84 instanceof mapnik.Projection, true); var long_lat_coords = [-122.33517, 47.63752]; assert.throws(function() { wgs84.forward(long_lat_coords); }); diff --git a/test/support/composites.xml b/test/support/composites.xml index 803162024b..2916cc11b1 100644 --- a/test/support/composites.xml +++ b/test/support/composites.xml @@ -1,4 +1,4 @@ - +