unify the JS and TS namespaces

mmomtchev · Oct 17, 2024 · 85f420a · 85f420a
1 parent c501ec4
commit 85f420a
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/test/browser/index.ts b/test/browser/index.ts
@@ -4,7 +4,7 @@ import qPROJ from 'proj.js';
 
 // This allows for easier access to the TypeScript types
 // which are hidden behind a Promise
-import type * as Proj from 'proj.js';
+import type * as PROJ from 'proj.js';
 
 // refer to the webpack configuration to ses how this works
 // @ts-ignore
@@ -39,7 +39,7 @@ print('Loading WASM');
   const coord_op_ctxt = PROJ.CoordinateOperationContext.create(authFactory, null, 0);
   const authFactoryEPSG = PROJ.AuthorityFactory.create(dbContext, 'EPSG');
   const sourceCRS = authFactoryEPSG.createCoordinateReferenceSystem('4326');
-  const targetCRS = PROJ.createFromUserInput('+proj=utm +zone=31 +datum=WGS84 +type=crs', dbContext) as Proj.CRS;
+  const targetCRS = PROJ.createFromUserInput('+proj=utm +zone=31 +datum=WGS84 +type=crs', dbContext) as PROJ.CRS;
   const list = PROJ.CoordinateOperationFactory.create().createOperations(sourceCRS, targetCRS, coord_op_ctxt);
 
   const transformer = list[0].coordinateTransformer();

diff --git a/test/shared/coordinateoperation.test.ts b/test/shared/coordinateoperation.test.ts
@@ -1,25 +1,25 @@
 import { assert } from 'chai';
 
 import qPROJ from 'proj.js';
-import type * as Proj from 'proj.js';
+import type * as PROJ from 'proj.js';
 
 describe('CoordinateOperation with automatic import', () => {
   let PROJ: Awaited<typeof qPROJ>;
 
-  let dbContext: Proj.DatabaseContext;
-  let authFactory: Proj.AuthorityFactory;
-  let authFactoryEPSG: Proj.AuthorityFactory;
-  let coord_op_ctxt: Proj.CoordinateOperationContext;
-  let sourceCRS, targetCRS: Proj.CRS;
-  let operation: Proj.CoordinateOperation;
+  let dbContext: PROJ.DatabaseContext;
+  let authFactory: PROJ.AuthorityFactory;
+  let authFactoryEPSG: PROJ.AuthorityFactory;
+  let coord_op_ctxt: PROJ.CoordinateOperationContext;
+  let sourceCRS, targetCRS: PROJ.CRS;
+  let operation: PROJ.CoordinateOperation;
 
   before('init', async () => {
     PROJ = await qPROJ;
     dbContext = PROJ.DatabaseContext.create();
     authFactory = PROJ.AuthorityFactory.create(dbContext, 'string');
     authFactoryEPSG = PROJ.AuthorityFactory.create(dbContext, 'EPSG');
     sourceCRS = authFactoryEPSG.createCoordinateReferenceSystem('4326');
-    targetCRS = PROJ.createFromUserInput('+proj=utm +zone=31 +datum=WGS84 +type=crs', dbContext) as Proj.CRS;
+    targetCRS = PROJ.createFromUserInput('+PROJ=utm +zone=31 +datum=WGS84 +type=crs', dbContext) as PROJ.CRS;
     coord_op_ctxt = PROJ.CoordinateOperationContext.create(authFactory, null, 0);
     const list = PROJ.CoordinateOperationFactory.create().createOperations(sourceCRS, targetCRS, coord_op_ctxt);
     operation = list[0];
@@ -29,7 +29,7 @@ describe('CoordinateOperation with automatic import', () => {
     assert.instanceOf(operation, PROJ.CoordinateOperation);
     assert.instanceOf(operation, PROJ.ConcatenatedOperation);
 
-    const ops = (operation as Proj.ConcatenatedOperation).operations();
+    const ops = (operation as PROJ.ConcatenatedOperation).operations();
     assert.isArray(ops);
     assert.isAtLeast(ops.length, 2);
 
@@ -47,8 +47,8 @@ describe('CoordinateOperation with automatic import', () => {
   it.skip('formula (optional string that is not empty)', () => {
     // TODO: PROJ returns a dangling pointer for method and ASAN reports a heap overflow
     // Remember to check it, maybe it is not supposed to work
-    const ops = (operation as Proj.ConcatenatedOperation).operations();
-    const single = ops[0] as Proj.SingleOperation;
+    const ops = (operation as PROJ.ConcatenatedOperation).operations();
+    const single = ops[0] as PROJ.SingleOperation;
     const method = single.method();
     assert.instanceOf(method, PROJ.OperationMethod);
     assert.isString(method.formula());

diff --git a/test/shared/crs.test.ts b/test/shared/crs.test.ts
@@ -1,14 +1,14 @@
 import { assert } from 'chai';
 
 import qPROJ from 'proj.js';
-import type * as Proj from 'proj.js';
+import type * as PROJ from 'proj.js';
 
 describe('CRS with automatic import', () => {
   let PROJ: Awaited<typeof qPROJ>;
 
-  let dbContext: Proj.DatabaseContext;
-  let authFactory: Proj.AuthorityFactory;
-  let authFactoryEPSG: Proj.AuthorityFactory;
+  let dbContext: PROJ.DatabaseContext;
+  let authFactory: PROJ.AuthorityFactory;
+  let authFactoryEPSG: PROJ.AuthorityFactory;
 
   before('init', async () => {
     PROJ = await qPROJ;

diff --git a/test/shared/quickstart.ts b/test/shared/quickstart.ts
@@ -3,7 +3,7 @@ import qPROJ from 'proj.js';
 
 // This allows for easier access to the TypeScript types
 // which are hidden behind a Promise and PROJ is actually a variable
-import type * as Proj from 'proj.js';
+import type * as PROJ from 'proj.js';
 
 // These tests are shared between Node.js and the browser
 export default function (_PROJ: typeof qPROJ) {
@@ -28,7 +28,7 @@ export default function (_PROJ: typeof qPROJ) {
     const sourceCRS = authFactoryEPSG.createCoordinateReferenceSystem('4326');
     console.timeEnd('AuthorityFactory.create()');
     console.time('createFromUserInput()');
-    const targetCRS = PROJ.createFromUserInput('+proj=utm +zone=31 +datum=WGS84 +type=crs', dbContext) as Proj.CRS;
+    const targetCRS = PROJ.createFromUserInput('+proj=utm +zone=31 +datum=WGS84 +type=crs', dbContext) as PROJ.CRS;
     console.timeEnd('createFromUserInput()');
     console.time('CoordinateOperationFactory.create().createOperations()');
     const list = PROJ.CoordinateOperationFactory.create().createOperations(sourceCRS, targetCRS, coord_op_ctxt);