clustering added for more than 400 charging locations

Author: Robin Buschmann

interfaces/models/ILocationCluster.ts

@@ -1,7 +1,7 @@
 
 interface ILocationCluster {
 
-  id: number;
+  id?: number;
   longitude: number;
   latitude: number;
   epsilon: number;

package.json

@@ -1,6 +1,6 @@
 {
   "name": "intercharge-backend",
-  "version": "0.0.0",
+  "version": "1.0.1",
   "description": "Description for server-proto",
   "scripts": {
     "docs": "apidoc -i api/ -o documentation/",

services/ChargingLocationService.ts

@@ -80,6 +80,7 @@ export class ChargingLocationService {
     if (isOpen24Hours !== void 0) {
       evseWhere = {};
       evseWhere.isOpen24Hours = isOpen24Hours;
+
       evseWhereStr += `AND e.isOpen24Hours = :isOpen24Hours`;
       replacements.isOpen24Hours = isOpen24Hours;
     }
@@ -112,6 +113,7 @@ export class ChargingLocationService {
         through: {attributes: []}, // removes EVSEChargingFacility property from status,
         where: {id: {$in: chargingFacilityIds}}
       });
+
       evseChargingFacilityJoin = `
         INNER JOIN EVSEChargingFacility ecf ON ecf.evseId = e.id
         AND ecf.chargingFacilityId IN (:chargingFacilityIds)
@@ -126,6 +128,7 @@ export class ChargingLocationService {
         through: {attributes: []}, // removes EVSEPlug property from status
         where: {id: {$in: plugIds}}
       });
+
       evsePlugJoin = `
         INNER JOIN EVSEPlug ep ON ep.evseId = e.id
         AND ep.plugId IN (:plugIds)
@@ -140,6 +143,15 @@ export class ChargingLocationService {
           include: chargingLocationInclude,
           where
         })
+        .then(chargingLocations => {
+
+          if(chargingLocations.length > 400) {
+
+            return <any>this.geoService.getLocationClusters(chargingLocations, epsilon);
+          }
+
+          return chargingLocations;
+        })
         ;
     }
 

services/GeoService.ts

@@ -10,7 +10,7 @@ export class GeoService {
    * If one cluster consists of one coordinate, this coordinate
    * will be returned as it is
    */
-  getLocationClusters(chargingLocations: IChargingLocation[], epsilon: number, idObject: {id: number}): Promise<ILocationCluster[]> {
+  getLocationClusters(chargingLocations: IChargingLocation[], epsilon: number, idObject?: {id: number}): Promise<ILocationCluster[]> {
 
     return new Promise<ILocationCluster[]>((resolve, reject) => {
 
@@ -34,6 +34,14 @@ export class GeoService {
   getEpsilonByZoom(zoom: number) {
 
     switch (zoom) {
+      case 15:
+        return 0.002;
+      case 14:
+        return 0.003;
+      case 13:
+        return 0.006;
+      case 12:
+        return 0.0089;
       case 11:
         return 0.01;
       case 10:
@@ -90,9 +98,9 @@ export class GeoService {
    * coordinates, if list contains only one element,
    * this element will be returned
    */
-  private getLocationCluster(chargingLocations: IChargingLocation[], epsilon: number, idObject: {id:number}): ILocationCluster {
+  private getLocationCluster(chargingLocations: IChargingLocation[], epsilon: number, idObject?: {id:number}): ILocationCluster {
 
-    const id = idObject.id++;
+    const id = idObject ? idObject.id++ : null;
 
     if (chargingLocations.length == 1) {