Merge pull request #64 from urbanriskmap/dev

flagged reports functionality

deployments/in/resources/layers.ts

@@ -137,7 +137,10 @@ export default {
           'icon-ignore-placement': true,
           'icon-size': 0.75
         },
-        filter: ['all', ['!=', 'pkey', '']]
+        filter: ['all',
+          // Use this array to change icons for report selection
+          ['!=', 'pkey', '']
+        ]
       },
       legend: [
         {

package.json

@@ -4,7 +4,7 @@
   "author": "Urban Risk Lab",
   "license": "GPL-3.0",
   "scripts": {
-    "start": "dep=us npm run fetch-assets && ng serve",
+    "start": "dep=in npm run fetch-assets && ng serve",
     "build": "npm run build-dev && npm run build-prod",
     "build-dev": "npm run build-dev-in && npm run build-dev-us",
     "build-prod": "npm run build-prod-ngsw-us && npm run build-prod-ngsw-in",

src/app/services/layer.service.ts

@@ -110,6 +110,22 @@ export class LayerService {
     }
   }
 
+// removing flagged reorts from the map
+  getUnflaggedReports(
+    reports: Feature<GeometryObject, { [name: string]: any }>[]
+  ): Feature<GeometryObject, { [name: string]: any }>[] {
+    const unflaggedReports = [];
+
+    for (const report of reports) {
+      if (!report.properties.report_data.hasOwnProperty('flag')
+      && !report.properties.report_data.flag === true) {
+        unflaggedReports.push(report);
+      }
+    }
+
+    return unflaggedReports;
+  }
+
   initializeLayers(
     region: Region,
     adminMode: boolean
@@ -180,6 +196,7 @@ export class LayerService {
 
             default:
               if (layer.metadata.name === 'reports') {
+                geojson.features = this.getUnflaggedReports(geojson.features);
                 this.showReportsNotification(geojson.features.length);
               }
               // Overwrite data object

src/environments/environment.ts

@@ -1,57 +1,51 @@
 export const environment = {
   production: false,
-  envName: 'dev-us',
-  deploymentName: 'us',
+  envName: 'dev-in',
+  deploymentName: 'in',
 
   servers: {
-    data: 'https://data-dev.riskmap.us/',
-    sensors: 'https://sensors-dev.riskmap.us/',
-    web_app: 'https://dev.riskmap.us/',
+    data: 'https://data-dev.riskmap.in/',
+    sensors: 'https://sensors-dev.riskmap.in/',
+    web_app: 'https://dev.riskmap.in/',
     settings: {
       reportTimeperiod: 604800
     }
   },
 
   authorization: {
-    userPoolId: 'us-west-2_olPNYtmQ7',
-    appClientId: '5en9df3auvag0msrurit123v30'
+    userPoolId: 'ap-south-1_yNLDVmvAW',
+    appClientId: '7iu4qevi6rge61bsnaovckghup'
   },
 
   map: {
     accessToken: 'pk.eyJ1IjoidXJiYW5yaXNrbWFwIiwiYSI6ImNqZnY2cGxndzN3M3AyeHMydGVyeHcyMWIifQ.D6K1H9c8CTnP6twGYdtDKA',
-    center: [-80.199261, 26.138301],
-    initZoom: 11,
-    minZoom: 9,
+    center: [76.5, 19], // map initializes on india
+    initZoom: 6,
+    minZoom: 6,
     baseMapStyle: 'mapbox://styles/urbanriskmap/cjfvacwic1cfc2smiwbyfwcs4'
   },
 
   locales: {
     supportedLanguages: [
       {code: 'en', name: 'English'},
-      {code: 'es', name: 'Spanish'}
+      {code: 'hi', name: 'Hindi'},
+      {code: 'ta', name: 'Tamil'},
+      {code: 'mr', name: 'Marathi'},
+      {code: 'ml', name: 'Malayalam'}
     ],
     defaultLanguage: 'en',
-    timezone: 'America/New_York'
+    timezone: 'Asia/Kolkata'
   },
 
   networks: {
     contact_links: {
-      flag_email: 'risk@mit.edu'
+      flag_email: 'riskmap@mit.edu'
     },
 
     deep_links: [
-      { name: 'facebook',
-        link: 'http://m.me/1747847428843379' // FB page id is used as no username is allowed at this point.
-      },
-      { name: 'twitter',
-        link: 'https://twitter.com/messages/compose?recipient_id=915571825689624576'
-      },
-      {
-        name: 'sms',
-        link: 'sms:1-202-883-5663;?&body=flood'
-      }
-      // Disable telegram button for US deployment
-      // {name: 'telegram', link: 'https://telegram.me/CognicityUS_bot'}
-    ]
+        {name: 'facebook', link: 'http://m.me/CognicityDevIndia'},
+        // {name: 'twitter', link: 'https://twitter.com/intent/tweet?text=Report+flood&via=CognicityDev_IN'},
+        {name: 'telegram', link: 'https://telegram.me/CognicityIN_bot'}
+      ]
   }
 };