Merge pull request #97 from urbanriskmap/dev

Merge dev into master to prepare v3.1.0 release

.travis.yml

@@ -60,7 +60,7 @@ deploy: #build the docs for dev branch only
     zip_file: dist.zip
     on:
       branch: dev
-  - provider: elasticbeanstalk # deploy the dev us server
+  - provider: elasticbeanstalk # deploy the prod us server
     access_key_id: $AWS_ACCESS_KEY_ID
     secret_access_key: $AWS_SECRET_ACCESS_KEY
     region: $AWS_EB_REGION_US
@@ -69,5 +69,27 @@ deploy: #build the docs for dev branch only
     bucket_name: $AWS_EB_APP_BUCKET_US_PROD
     skip_cleanup: true
     zip_file: dist.zip
+    on:
+      branch: master
+  - provider: elasticbeanstalk # deploy the dev in server
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    region: $AWS_EB_REGION_IN
+    app: $AWS_EB_APP_IN
+    env: $AWS_EB_APP_ENV_IN_DEV
+    bucket_name: $AWS_EB_APP_BUCKET_IN_DEV
+    skip_cleanup: true
+    zip_file: dist.zip
+    on:
+      branch: dev
+  - provider: elasticbeanstalk # deploy the prod in server
+    access_key_id: $AWS_ACCESS_KEY_ID
+    secret_access_key: $AWS_SECRET_ACCESS_KEY
+    region: $AWS_EB_REGION_IN
+    app: $AWS_EB_APP_IN
+    env: $AWS_EB_APP_ENV_IN_PROD
+    bucket_name: $AWS_EB_APP_BUCKET_IN_PROD
+    skip_cleanup: true
+    zip_file: dist.zip
     on:
       branch: master

CHANGELOG.md

@@ -52,4 +52,10 @@ API Server for CogniCity
 * Remove ?format option from /reports endpoint
 * Change floods endpoint to return new attributes column
 * Requires cognicity-schema v3.0.7 or later
-* Updated npm packages
+* Updated npm packages
+
+### v3.1.0
+* Add city query parameter to /floods/timeseries and /floods/archive endpoints
+* Add time zone validation to all endpoints accepting timestamps
+* Notifications of received reports are now run from the server (added for testing in v3.0.6)
+* Add deployments for India

README.md

@@ -100,7 +100,7 @@ A few points to note on config:
 Run `npm run -s build` to build.
 
 ### Testing
-Testing is run by [Travis](https://travis-ci.org/urbanriskmap/cognicity-server). ESLint runs to check syntax. Integration tests, formed by chaining unit tests, are used to check the API.  Coverage is provided by Istanbul and [Coveralls](https://coveralls.io/github/urbanriskmap/cognicity-server). See src/test/ for scripts. Beware that integration tests may pollute tables (e.g. user tables in feeds), it is not recommended to run tests against prod databases with live data. The default database (used for testing) is cognicity. Travis-ci creates a new schema instance for testing using https://github.com/urbanriskmap/cognicity-schema, see .travis.yml for more details.
+Testing is run by [Travis](https://travis-ci.org/urbanriskmap/cognicity-server). ESLint runs to check syntax. Integration tests, formed by chaining unit tests, are used to check the API.  Coverage is provided by Istanbul and [Coveralls](https://coveralls.io/github/urbanriskmap/cognicity-server). See src/test/ for scripts. Beware that integration tests may pollute tables (e.g. user tables in feeds), it is not recommended to run tests against prod databases with live data. The default database (used for testing) is cognicity. Travis-ci creates a new schema instance for testing using https://github.com/urbanriskmap/cognicity-schema, see the .travis.yml file for more details.
 
 To run tests locally a new database "cognicity_server_testing" is required on localhost.