Skip to content

Commit 7e93421

Browse files
artempartemp
committed
proj6 - WIP
1 parent 981898f commit 7e93421

23 files changed

+90
-90
lines changed

‎src/mapnik_map.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Napi::Object Map::Initialize(Napi::Env env, Napi::Object exports, napi_property_
8585
* @param {int} width in pixels
8686
* @param {int} height in pixels
8787
* @param {string} [projection='+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs'] projection as a proj4 code
88-
* typically used with '+init=epsg:3857'
88+
* typically used with 'epsg:3857'
8989
* @property {string} src
9090
* @property {number} width
9191
* @property {number} height
@@ -97,7 +97,7 @@ Napi::Object Map::Initialize(Napi::Env env, Napi::Object exports, napi_property_
9797
* @property {} parameters
9898
* @property {} aspect_fix_mode
9999
* @example
100-
* var map = new mapnik.Map(600, 400, '+init=epsg:3857');
100+
* var map = new mapnik.Map(600, 400, 'epsg:3857');
101101
* console.log(map);
102102
* // {
103103
* // aspect_fix_mode: 0,
@@ -113,7 +113,7 @@ Napi::Object Map::Initialize(Napi::Env env, Napi::Object exports, napi_property_
113113
* // bufferSize: 0,
114114
* // height: 400,
115115
* // width: 600,
116-
* // srs: '+init=epsg:3857'
116+
* // srs: 'epsg:3857'
117117
* // }
118118
*/
119119

‎src/mapnik_projection.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ Napi::Object Projection::Initialize(Napi::Env env, Napi::Object exports, napi_pr
3636
* @throws {Error} the projection could not be initialized - it was not found
3737
* in proj4's tables or the string was malformed
3838
* @example
39-
* var wgs84 = new mapnik.Projection('+init=epsg:4326');
39+
* var wgs84 = new mapnik.Projection('epsg:4326');
4040
*/
4141

4242
Projection::Projection(Napi::CallbackInfo const& info)
@@ -87,7 +87,7 @@ Projection::Projection(Napi::CallbackInfo const& info)
8787
* @param {Array<number>} position as [x, y] or extent as [minx,miny,maxx,maxy]
8888
* @returns {Array<number>} projected coordinates
8989
* @example
90-
* var merc = new mapnik.Projection('+init=epsg:3857');
90+
* var merc = new mapnik.Projection('epsg:3857');
9191
* var long_lat_coords = [-122.33517, 47.63752];
9292
* var projected = merc.forward(long_lat_coords);
9393
*/
@@ -315,7 +315,7 @@ Napi::Value ProjTransform::forward(Napi::CallbackInfo const& info)
315315
{
316316
std::ostringstream s;
317317
s << "Failed to forward project "
318-
<< x << "," << y << " from " << proj_transform_->source().params() << " to " << proj_transform_->dest().params();
318+
<< x << "," << y << " " << proj_transform_->definition();
319319
Napi::Error::New(env, s.str().c_str()).ThrowAsJavaScriptException();
320320
return env.Undefined();
321321
}
@@ -334,7 +334,7 @@ Napi::Value ProjTransform::forward(Napi::CallbackInfo const& info)
334334
{
335335
std::ostringstream s;
336336
s << "Failed to forward project "
337-
<< box << " from " << proj_transform_->source().params() << " to " << proj_transform_->dest().params();
337+
<< box << " " << proj_transform_->definition();
338338
Napi::Error::New(env, s.str()).ThrowAsJavaScriptException();
339339
return env.Undefined();
340340
}
@@ -385,7 +385,7 @@ Napi::Value ProjTransform::backward(Napi::CallbackInfo const& info)
385385
{
386386
std::ostringstream s;
387387
s << "Failed to back project "
388-
<< x << "," << y << " from " << proj_transform_->dest().params() << " to: " << proj_transform_->source().params();
388+
<< x << "," << y << " " << proj_transform_->definition();
389389
Napi::Error::New(env, s.str()).ThrowAsJavaScriptException();
390390
return env.Null();
391391
}
@@ -404,7 +404,7 @@ Napi::Value ProjTransform::backward(Napi::CallbackInfo const& info)
404404
{
405405
std::ostringstream s;
406406
s << "Failed to back project "
407-
<< box << " from " << proj_transform_->source().params() << " to " << proj_transform_->dest().params();
407+
<< box << " " << proj_transform_->definition();
408408
Napi::Error::New(env, s.str()).ThrowAsJavaScriptException();
409409
return env.Null();
410410
}

‎src/mapnik_vector_tile_composite.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ void _composite(tile_type target_tile,
2323
std::launch threading_mode)
2424
{
2525
// create map
26-
mapnik::Map map(target_tile->size(), target_tile->size(), "+init=epsg:3857");
26+
mapnik::Map map(target_tile->size(), target_tile->size(), "epsg:3857");
2727
if (max_extent)
2828
{
2929
map.set_maximum_extent(*max_extent);
@@ -575,7 +575,7 @@ Napi::Value VectorTile::composite(Napi::CallbackInfo const& info)
575575
std::string image_format = "webp";
576576
mapnik::scaling_method_e scaling_method = mapnik::SCALING_BILINEAR;
577577
std::launch threading_mode = std::launch::deferred;
578-
std::string merc_srs("+init=epsg:3857");
578+
std::string merc_srs("epsg:3857");
579579

580580
if (info.Length() > 2)
581581
{

‎src/mapnik_vector_tile_image.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ Napi::Value VectorTile::addImageSync(Napi::CallbackInfo const& info)
127127
try
128128
{
129129
// create map object
130-
mapnik::Map map(tile_->size(), tile_->size(), "+init=epsg:3857");
131-
mapnik::layer lyr(layer_name, "+init=epsg:3857");
130+
mapnik::Map map(tile_->size(), tile_->size(), "epsg:3857");
131+
mapnik::layer lyr(layer_name, "epsg:3857");
132132
lyr.set_datasource(ds);
133133
map.add_layer(lyr);
134134

@@ -178,8 +178,8 @@ struct AsyncAddImage : Napi::AsyncWorker
178178
ds->envelope(); // can be removed later, currently doesn't work with out this.
179179
ds->set_envelope(tile_->extent());
180180
// create map object
181-
mapnik::Map map(tile_->size(), tile_->size(), "+init=epsg:3857");
182-
mapnik::layer lyr(layer_name_, "+init=epsg:3857");
181+
mapnik::Map map(tile_->size(), tile_->size(), "epsg:3857");
182+
mapnik::layer lyr(layer_name_, "epsg:3857");
183183
lyr.set_datasource(ds);
184184
map.add_layer(lyr);
185185

‎src/mapnik_vector_tile_json.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -319,8 +319,8 @@ bool layer_to_geojson(protozero::pbf_reader const& layer,
319319
unsigned z)
320320
{
321321
mapnik::vector_tile_impl::tile_datasource_pbf ds(layer, x, y, z);
322-
mapnik::projection wgs84("+init=epsg:4326", true);
323-
mapnik::projection merc("+init=epsg:3857", true);
322+
mapnik::projection wgs84("epsg:4326", true);
323+
mapnik::projection merc("epsg:3857", true);
324324
mapnik::proj_transform prj_trans(merc, wgs84);
325325
// This mega box ensures we capture all features, including those
326326
// outside the tile extent. Geometries outside the tile extent are
@@ -1095,11 +1095,11 @@ Napi::Value VectorTile::addGeoJSON(Napi::CallbackInfo const& info)
10951095
{
10961096
// create map object
10971097
auto tile_size = tile_->tile_size();
1098-
mapnik::Map map(tile_size, tile_size, "+init=epsg:3857");
1098+
mapnik::Map map(tile_size, tile_size, "epsg:3857");
10991099
mapnik::parameters p;
11001100
p["type"] = "geojson";
11011101
p["inline"] = geojson_string;
1102-
mapnik::layer lyr(geojson_name, "+init=epsg:4326");
1102+
mapnik::layer lyr(geojson_name, "epsg:4326");
11031103
lyr.set_datasource(mapnik::datasource_cache::instance().create(p));
11041104
map.add_layer(lyr);
11051105

‎src/mapnik_vector_tile_query.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -175,8 +175,8 @@ std::vector<query_result> _query(mapnik::vector_tile_impl::merc_tile_ptr const&
175175
return arr;
176176
}
177177

178-
mapnik::projection wgs84("+init=epsg:4326", true);
179-
mapnik::projection merc("+init=epsg:3857", true);
178+
mapnik::projection wgs84("epsg:4326", true);
179+
mapnik::projection merc("epsg:3857", true);
180180
mapnik::proj_transform tr(wgs84, merc);
181181
double x = lon;
182182
double y = lat;
@@ -385,8 +385,8 @@ void _queryMany(queryMany_result& result,
385385

386386
// Reproject query => mercator points
387387
mapnik::box2d<double> bbox;
388-
mapnik::projection wgs84("+init=epsg:4326", true);
389-
mapnik::projection merc("+init=epsg:3857", true);
388+
mapnik::projection wgs84("epsg:4326", true);
389+
mapnik::projection merc("epsg:3857", true);
390390
mapnik::proj_transform tr(wgs84, merc);
391391
std::vector<mapnik::coord2d> points;
392392
points.reserve(query.size());

‎src/mapnik_vector_tile_simple_valid.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -371,8 +371,8 @@ void layer_not_valid(protozero::pbf_reader& layer_msg,
371371
{
372372
if (lat_lon)
373373
{
374-
mapnik::projection wgs84("+init=epsg:4326", true);
375-
mapnik::projection merc("+init=epsg:3857", true);
374+
mapnik::projection wgs84("epsg:4326", true);
375+
mapnik::projection merc("epsg:3857", true);
376376
mapnik::proj_transform prj_trans(merc, wgs84);
377377
unsigned int n_err = 0;
378378
mapnik::util::apply_visitor(

‎test/data/postgis_datasource_tokens_query.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Map srs="+init=epsg:3857">
3-
<Layer name="field_shapes" status="on" srs="+init=epsg:4326">
2+
<Map srs="epsg:3857">
3+
<Layer name="field_shapes" status="on" srs="epsg:4326">
44
<Datasource>
55
<Parameter name="type">postgis</Parameter>
66
<Parameter name="host">localhost</Parameter>

‎test/data/vector_tile/compositing/layers/lines.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</Rule>
77
</Style>
88

9-
<Layer name="lines" srs="+init=epsg:4326">
9+
<Layer name="lines" srs="epsg:4326">
1010
<StyleName>lines</StyleName>
1111
<Datasource>
1212
<Parameter name="type">csv</Parameter>
@@ -17,5 +17,5 @@ wkt
1717
</Parameter>
1818
</Datasource>
1919
</Layer>
20-
21-
</Map>
20+
21+
</Map>

‎test/data/vector_tile/compositing/layers/points.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
</Rule>
77
</Style>
88

9-
<Layer name="points" srs="+init=epsg:4326">
9+
<Layer name="points" srs="epsg:4326">
1010
<StyleName>points</StyleName>
1111
<Datasource>
1212
<Parameter name="type">csv</Parameter>
@@ -15,5 +15,5 @@ x,y
1515
0,0
1616
</Parameter>
1717
</Datasource>
18-
</Layer>
19-
</Map>
18+
</Layer>
19+
</Map>

‎test/data/vector_tile/pasted/pasted11.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Rule>
88
</Style>
99

10-
<Layer name="pasted" srs="+init=epsg:4326">
10+
<Layer name="pasted" srs="epsg:4326">
1111
<StyleName>style</StyleName>
1212
<Datasource>
1313
<Parameter name="file">pasted11.shp</Parameter>

‎test/data/vector_tile/pasted/pasted12.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Rule>
88
</Style>
99

10-
<Layer name="pasted" srs="+init=epsg:4326">
10+
<Layer name="pasted" srs="epsg:4326">
1111
<StyleName>style</StyleName>
1212
<Datasource>
1313
<Parameter name="file">pasted12.geojson</Parameter>

‎test/data/vector_tile/pasted/pasted13.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Rule>
88
</Style>
99

10-
<Layer buffer-size="4" name="pasted" srs="+init=epsg:4326">
10+
<Layer buffer-size="4" name="pasted" srs="epsg:4326">
1111
<StyleName>style</StyleName>
1212
<Datasource>
1313
<Parameter name="file">pasted13.geojson</Parameter>

‎test/data/vector_tile/pasted/pasted14.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Rule>
88
</Style>
99

10-
<Layer buffer-size="4" name="pasted" srs="+init=epsg:4326">
10+
<Layer buffer-size="4" name="pasted" srs="epsg:4326">
1111
<StyleName>style</StyleName>
1212
<Datasource>
1313
<Parameter name="file">pasted14.geojson</Parameter>

‎test/data/vector_tile/pasted/pasted17.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
</Rule>
88
</Style>
99

10-
<Layer buffer-size="8" name="pasted" srs="+init=epsg:4326">
10+
<Layer buffer-size="8" name="pasted" srs="epsg:4326">
1111
<StyleName>style</StyleName>
1212
<Datasource>
1313
<Parameter name="file">pasted17.geojson</Parameter>

‎test/datasource.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ test('should validate with raster', (assert) => {
233233
assert.deepEqual(expected,describe);
234234

235235
// Test that if added to layer, can get datasource back
236-
var layer = new mapnik.Layer('foo', '+init=epsg:4326');
236+
var layer = new mapnik.Layer('foo', 'epsg:4326');
237237
layer.datasource = ds;
238238
var ds2 = layer.datasource;
239239
assert.ok(ds2);

‎test/feature.test.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -184,8 +184,8 @@ test('should be able to create feature from geojson and turn back into geojson',
184184
assert.deepEqual(geom.extent(),[ 1, 1, 2, 2 ]);
185185
var expected_geom = JSON.stringify(expected.geometry);
186186
assert.equal(expected_geom,geom.toJSON());
187-
var source_proj = new mapnik.Projection('+init=epsg:4326');
188-
var dest_proj = new mapnik.Projection('+init=epsg:3857');
187+
var source_proj = new mapnik.Projection('epsg:4326');
188+
var dest_proj = new mapnik.Projection('epsg:3857');
189189
var trans = new mapnik.ProjTransform(source_proj,dest_proj);
190190
var transformed = geom.toJSON({transform:trans});
191191
assert.notEqual(expected_geom,transformed);
@@ -264,8 +264,8 @@ test('should be able to reproject geojson feature', (assert) => {
264264
assert.ok(Math.abs(ext[0] - expected_ext[0]) < 0.001);
265265
var input_geom = JSON.stringify(input.geometry);
266266
assert.equal(input_geom,geom.toJSON());
267-
var dest_proj = new mapnik.Projection('+init=epsg:4326');
268-
var source_proj = new mapnik.Projection('+init=epsg:3857');
267+
var dest_proj = new mapnik.Projection('epsg:4326');
268+
var source_proj = new mapnik.Projection('epsg:3857');
269269
var trans = new mapnik.ProjTransform(source_proj,dest_proj);
270270
var expected_transformed = {
271271
"type": "MultiPolygon",

‎test/layers.test.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ test('should throw with invalid usage', (assert) => {
1818

1919
test('should initialize properly', (assert) => {
2020
mapnik.register_datasource(path.join(mapnik.settings.paths.input_plugins,'shape.input'));
21-
var layer = new mapnik.Layer('foo', '+init=epsg:4326');
21+
var layer = new mapnik.Layer('foo', 'epsg:4326');
2222
assert.equal(layer.name, 'foo');
2323
layer.active = true;
2424
assert.equal(layer.active, true);
@@ -40,7 +40,7 @@ test('should initialize properly', (assert) => {
4040
assert.throws(function() { layer.maximum_scale_denominator = null; });
4141
assert.throws(function() { layer.queryable = null; });
4242
assert.throws(function() { layer.clear_label_cache = null; });
43-
assert.equal(layer.srs, '+init=epsg:4326');
43+
assert.equal(layer.srs, 'epsg:4326');
4444
assert.deepEqual(layer.styles, []);
4545
// will be empty/undefined
4646
assert.ok(!layer.datasource);
@@ -61,7 +61,7 @@ test('should initialize properly', (assert) => {
6161
assert.equal(meta.queryable, false);
6262
assert.equal(meta.clear_label_cache, false);
6363
assert.equal(meta.name, 'foo');
64-
assert.equal(meta.srs, '+init=epsg:4326');
64+
assert.equal(meta.srs, 'epsg:4326');
6565
assert.deepEqual(meta.styles, []);
6666
assert.deepEqual(meta.datasource, options);
6767
assert.end();

‎test/map.test.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ test('should be initialized properly', (assert) => {
3333

3434
test('should be initialized properly with projection', (assert) => {
3535
// TODO - more tests
36-
var map = new mapnik.Map(25,25,'+init=epsg:3857');
36+
var map = new mapnik.Map(25,25,'epsg:3857');
3737
assert.ok(map instanceof mapnik.Map);
38-
assert.equal(map.srs, '+init=epsg:3857');
38+
assert.equal(map.srs, 'epsg:3857');
3939
assert.end();
4040
});
4141

@@ -102,8 +102,8 @@ test('should have settable properties', (assert) => {
102102

103103
assert.equal(map.srs, "+proj=longlat +ellps=WGS84 +datum=WGS84 +no_defs");
104104
assert.throws(function() { map.srs = 100; });
105-
map.srs = '+init=epsg:3857';
106-
assert.equal(map.srs, '+init=epsg:3857');
105+
map.srs = 'epsg:3857';
106+
assert.equal(map.srs, 'epsg:3857');
107107

108108
// Test Parameters
109109
assert.throws(function() { map.parameters = null; });
@@ -388,7 +388,7 @@ test('should allow access to layers', (assert) => {
388388
// make a change to layer, ensure it sticks
389389
layer.name = 'a';
390390
layer.styles = ['a'];
391-
layer.srs = '+init=epsg:4326';
391+
layer.srs = 'epsg:4326';
392392
layer.datasource = new mapnik.Datasource(options);
393393

394394
// Assert that add layer throws for bad layers

0 commit comments

Comments
 (0)