fixed bugs

watergis · Jul 24, 2020 · d52d1bc · d52d1bc
1 parent 7f41794
commit d52d1bc
Show file tree

Hide file tree

Showing 21 changed files with 51 additions and 83 deletions.
diff --git a/src/geojson2inp.ts b/src/geojson2inp.ts
@@ -34,7 +34,12 @@ class geojson2inp {
         pumps,
         valves
       ];
-      layers.forEach(t=>{t.load()})
+      layers.forEach(t=>{
+        const isSucceess = t.load();
+        if (isSucceess === false && ['Coordinates', 'Pipes'].includes(t.name)){
+          reject('GeoJSON has no any features in Coordinates or Pipes layers.')
+        }
+      })
 
       if (fs.existsSync(this.output)) {
         fs.unlinkSync(this.output);

diff --git a/src/inp/InpBase.ts b/src/inp/InpBase.ts
@@ -1,13 +1,7 @@
 import fs from 'fs';
 
 export default class InpBase{
-  protected file: string = '';
-  protected title: string | undefined;
-
-  constructor(file: string, title?: string) {
-    this.file = file;
-    this.title = title;
-  }
+  constructor(protected file: string, protected title?: string) {}
 
   addText(text: string) {
     fs.appendFileSync(this.file, text);

diff --git a/src/inp/InpCoordinates.ts b/src/inp/InpCoordinates.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { Coordinate } from '../asset';
 
 export default class InpCoordinates extends InpBase {
-  private coordMap: { [key: string]: Coordinate };
-  constructor(file: string, coordMap: { [key: string]: Coordinate }) {
+  constructor(file: string, private coordMap: { [key: string]: Coordinate }) {
     super(file, 'COORDINATES')
-    this.coordMap = coordMap;
   }
 
   createHeader() {

diff --git a/src/inp/InpCurves.ts b/src/inp/InpCurves.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { PumpCurve, Pump } from '../asset';
 
 export default class InpPumps extends InpBase {
-  private pumps: Pump[];
-  constructor(file: string, pumps: Pump[]) {
+  constructor(file: string, private pumps: Pump[]) {
     super(file, 'CURVES')
-    this.pumps = pumps;
   }
 
   createHeader() {

diff --git a/src/inp/InpEnd.ts b/src/inp/InpEnd.ts
@@ -1,7 +1,7 @@
 import InpBase from './InpBase';
 
 export default class InpEnd extends InpBase {
-  constructor(file: string) {
+  constructor(protected file: string) {
     super(file, 'END')
   }
 

diff --git a/src/inp/InpJunctions.ts b/src/inp/InpJunctions.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { Coordinate } from '../asset';
 
 export default class InpJunctions extends InpBase {
-  private coordMap: { [key: string]: Coordinate };
-  constructor(file: string, coordMap: { [key: string]: Coordinate }) {
+  constructor(protected file: string, private coordMap: { [key: string]: Coordinate }) {
     super(file, 'JUNCTIONS')
-    this.coordMap = coordMap;
   }
 
   createHeader() {

diff --git a/src/inp/InpOptions.ts b/src/inp/InpOptions.ts
@@ -1,7 +1,7 @@
 import InpBase from './InpBase';
 
 export default class InpTitle extends InpBase {
-  constructor(file: string) {
+  constructor(protected file: string) {
     super(file)
   }
 

diff --git a/src/inp/InpPipes.ts b/src/inp/InpPipes.ts
@@ -3,12 +3,8 @@ import InpBase from './InpBase';
 import { Pipe } from '../asset';
 
 export default class InpPipes extends InpBase {
-  private pipes: Pipe[];
-  private idsExcludes: string[];
-  constructor(file: string, pipes: Pipe[], idsExcludes: string[]) {
+  constructor(protected file: string, private pipes: Pipe[], private idsExcludes: string[]) {
     super(file, 'PIPES')
-    this.pipes = pipes;
-    this.idsExcludes = idsExcludes;
   }
 
   createHeader() {

diff --git a/src/inp/InpPumps.ts b/src/inp/InpPumps.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { Pump } from '../asset';
 
 export default class InpPumps extends InpBase {
-  private pumps: Pump[];
-  constructor(file: string, pumps: Pump[]) {
+  constructor(protected file: string, private pumps: Pump[]) {
     super(file, 'PUMPS')
-    this.pumps = pumps;
   }
 
   createHeader() {

diff --git a/src/inp/InpReservoirs.ts b/src/inp/InpReservoirs.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { Reservoir } from '../asset';
 
 export default class InpReservoirs extends InpBase {
-  private reservoirs: Reservoir[];
-  constructor(file: string, reservoirs: Reservoir[]) {
+  constructor(protected file: string, private reservoirs: Reservoir[]) {
     super(file, 'RESERVOIRS')
-    this.reservoirs = reservoirs;
   }
 
   createHeader() {

diff --git a/src/inp/InpTanks.ts b/src/inp/InpTanks.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { Tank } from '../asset';
 
 export default class InpTanks extends InpBase {
-  private tanks: Tank[];
-  constructor(file: string, tanks: Tank[]) {
+  constructor(protected file: string, private tanks: Tank[]) {
     super(file, 'TANKS')
-    this.tanks = tanks;
   }
 
   createHeader() {

diff --git a/src/inp/InpTitle.ts b/src/inp/InpTitle.ts
@@ -1,10 +1,8 @@
 import InpBase from './InpBase';
 
 export default class InpTitle extends InpBase {
-  private projectTitle: string;
-  constructor(file: string, projectTitle: string) {
+  constructor(protected file: string, private projectTitle: string) {
     super(file, 'TITLE')
-    this.projectTitle = projectTitle;
   }
 
   exportContents() {

diff --git a/src/inp/InpValves.ts b/src/inp/InpValves.ts
@@ -3,10 +3,8 @@ import InpBase from './InpBase';
 import { Valve } from '../asset';
 
 export default class InpValves extends InpBase {
-  private valves: Valve[];
-  constructor(file: string, valves: Valve[]) {
+  constructor(protected file: string, private valves: Valve[]) {
     super(file, 'VALVES')
-    this.valves = valves;
   }
 
   createHeader() {

diff --git a/src/layer/Coordinates.ts b/src/layer/Coordinates.ts
@@ -5,13 +5,13 @@ import { InpJunctions, InpCoordinates } from '../inp';
 export default class Coordinates extends LayerBase {
   private coordMap: { [key: string]: Coordinate } = {};
 
-  constructor(geojsonFile: string) {
-    super(geojsonFile);
+  constructor(protected geojsonFile: string) {
+    super('Coordinates', geojsonFile);
   }
 
   load() {
     const geojson = this.loadGeoJSON();
-    if (!geojson){return;}
+    if (!geojson){return false;}
 
     this.coordMap = {};
     geojson.features.forEach((f: GeoJSON.Feature) => {

diff --git a/src/layer/LayerBase.ts b/src/layer/LayerBase.ts
@@ -1,11 +1,7 @@
 import fs from 'fs';
 
 export default class LayerBase {
-  protected geojsonFile: string;
-
-  constructor(geojsonFile: string) {
-    this.geojsonFile = geojsonFile;
-  }
+  constructor(public name: string, protected geojsonFile: string) {}
 
   loadGeoJSON() {
     if (fs.existsSync(this.geojsonFile)){
@@ -15,7 +11,8 @@ export default class LayerBase {
         return;
       }
       if (!(geojson.features && geojson.features.length >0)){
-        throw new Error(`No features in this GeoJSON file: ${this.geojsonFile}`);
+        console.log(`No features in this GeoJSON file: ${this.geojsonFile}`);
+        return;
       }
       return geojson;
     }

diff --git a/src/layer/Pipes.ts b/src/layer/Pipes.ts
@@ -8,11 +8,9 @@ import { InpPipes } from '../inp';
 
 export default class Pipes extends LayerBase {
   private pipes: Pipe[] = [];
-  private coords: Coordinates;
 
-  constructor(geojsonFile: string, coords: Coordinates) {
-    super(geojsonFile);
-    this.coords = coords;
+  constructor(protected geojsonFile: string, private coords: Coordinates) {
+    super('Pipes', geojsonFile);
   }
 
   load() {
@@ -21,7 +19,7 @@ export default class Pipes extends LayerBase {
     }
 
     const geojson = this.loadGeoJSON();
-    if (!geojson){return;}
+    if (!geojson){return false;}
     geojson.features.forEach((f: GeoJSON.Feature) => {
       const pipe_id: string = getProperty(f.properties, 'id');
       const pipe_size: number = getProperty(f.properties, 'diameter');

diff --git a/src/layer/Pumps.ts b/src/layer/Pumps.ts
@@ -5,8 +5,6 @@ import { InpPumps, InpCurves } from '../inp';
 
 export default class Pumps extends LayerBase {
   private pumps: Pump[] = [];
-  private pipes: Pipes;
-  private coords: Coordinates;
 
   private del_pipes_id: string[] = [];
   get_del_pipes_id(){
@@ -18,15 +16,13 @@ export default class Pumps extends LayerBase {
     return this.del_coords_id;
   }
 
-  constructor(geojsonFile: string, coords: Coordinates, pipes: Pipes) {
-    super(geojsonFile);
-    this.coords = coords;
-    this.pipes = pipes;
+  constructor(protected geojsonFile: string, private coords: Coordinates, private pipes: Pipes) {
+    super('Pumps', geojsonFile);
   }
 
   load() {
     const geojson = this.loadGeoJSON();
-    if (!geojson){return;}
+    if (!geojson){return false;}
     geojson.features.forEach((f: GeoJSON.Feature) => {
       const pump = new Pump(f.properties);
       this.pumps.push(pump);

diff --git a/src/layer/Reservoirs.ts b/src/layer/Reservoirs.ts
@@ -5,16 +5,14 @@ import {InpReservoirs} from '../inp';
 
 export default class Reservoirs extends LayerBase {
   private reservoirs: Reservoir[] = [];
-  private coords: Coordinates;
 
-  constructor(geojsonFile: string, coords: Coordinates) {
-    super(geojsonFile);
-    this.coords = coords;
+  constructor(protected geojsonFile: string, private coords: Coordinates) {
+    super('Reservoirs', geojsonFile);
   }
 
   load() {
     const geojson = this.loadGeoJSON();
-    if (!geojson){return;}
+    if (!geojson){return false;}
     geojson.features.forEach((f: GeoJSON.Feature) => {
       let r: Reservoir = new Reservoir(f.properties);
       this.reservoirs.push(r);

diff --git a/src/layer/Tanks.ts b/src/layer/Tanks.ts
@@ -6,16 +6,14 @@ import { InpTanks } from '../inp';
 
 export default class Tanks extends LayerBase {
   private tanks: Tank[] = [];
-  private coords: Coordinates;
 
-  constructor(geojsonFile: string, coords: Coordinates) {
-    super(geojsonFile);
-    this.coords = coords;
+  constructor(geojsonFile: string, private coords: Coordinates) {
+    super('Tanks', geojsonFile);
   }
 
   load() {
     const geojson = this.loadGeoJSON();
-    if (!geojson){return;}
+    if (!geojson){return false;}
     geojson.features.forEach((f: GeoJSON.Feature) => {
       let t: Tank = new Tank(f.properties);
       this.tanks.push(t);

diff --git a/src/layer/Valves.ts b/src/layer/Valves.ts
@@ -5,8 +5,6 @@ import { InpValves } from '../inp';
 
 export default class Valves extends LayerBase {
   private valves: Valve[] = [];
-  private pipes: Pipes;
-  private coords: Coordinates;
 
   private del_pipes_id: string[] = [];
   get_del_pipes_id(){
@@ -18,15 +16,13 @@ export default class Valves extends LayerBase {
     return this.del_coords_id;
   }
 
-  constructor(geojsonFile: string, coords: Coordinates, pipes: Pipes) {
-    super(geojsonFile);
-    this.coords = coords;
-    this.pipes = pipes;
+  constructor(protected geojsonFile: string, private coords: Coordinates, private pipes: Pipes) {
+    super('Valves', geojsonFile);
   }
 
   load() {
     const geojson = this.loadGeoJSON();
-    if (!geojson){return;}
+    if (!geojson){return false;}
     geojson.features.forEach((f: GeoJSON.Feature) => {
       const valve = new Valve(f.properties);
       this.valves.push(valve);

diff --git a/tests/index.test.ts b/tests/index.test.ts
@@ -58,7 +58,9 @@ describe('failed case', (): void => {
     expect.assertions(1);
     return js2inp.generate().catch(e => {
       expect(e).toBe('One of GeoJSON for jucntions and pipes are missing');
-      fs.unlinkSync(config.output);
+      if (fs.existsSync(config.output)){
+        fs.unlinkSync(config.output);
+      }
     });
   })
 
@@ -79,7 +81,9 @@ describe('failed case', (): void => {
     expect.assertions(1); 
     return js2inp.generate().catch(e => {
       expect(e).toBe('One of GeoJSON for jucntions and pipes are missing');
-      fs.unlinkSync(config.output);
+      if (fs.existsSync(config.output)){
+        fs.unlinkSync(config.output);
+      }
     });
   })
 
@@ -99,11 +103,13 @@ describe('failed case', (): void => {
     expect.assertions(1);
     return js2inp.generate().catch(e => {
       expect(e).toBe('One of GeoJSON for jucntions and pipes are missing');
-      fs.unlinkSync(config.output);
+      if (fs.existsSync(config.output)){
+        fs.unlinkSync(config.output);
+      }
     });
   })
 
-  test('geojson is NULL', () => {
+  test('geojson is NULL', async() => {
     const config = {
       title: 'test',
       geojson: {
@@ -118,9 +124,9 @@ describe('failed case', (): void => {
     }
 
     const js2inp = new geojson2inp(config.geojson, config.output, config.title);   
-    // expect.assertions(1);
+    expect.assertions(1);
     return js2inp.generate().catch(e => {
-      expect(e.message).toMatch(/No features in this GeoJSON file/);
+      expect(e).toBe('GeoJSON has no any features in Coordinates or Pipes layers.');
       if (fs.existsSync(config.output)){
         fs.unlinkSync(config.output);
       }