Commit b7509953 authored by Cédric Bonhomme's avatar Cédric Bonhomme

Fixed conflict.

parents b1e9857d b6b3759e
......@@ -23,6 +23,7 @@ venv
build
# bower
src/web/static/lib/*
!src/web/static/lib/leaflet
!src/web/static/lib/dc
......@@ -38,3 +39,6 @@ node_modules
documentation/_build/
src/conf/conf.cfg
src/web/public/
# pycharm
.idea/
<<<<<<< HEAD
<<<<<<< HEAD
Shelter Database project news
0.3 (2016-08-02)
......@@ -16,3 +17,9 @@ Shelter Database project news
0.1 (2015-03-30)
- initial release.
>>>>>>> 011351c71fefe44d232b84497307f51ee6d5b501
=======
Shelter Database project news
0.1 (2015-03-30)
- initial release.
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
<<<<<<< HEAD
<<<<<<< HEAD
API
===
Examples of requests to the Web Service
=======
Web Services
============
Example of requests to the Web Service
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
--------------------------------------
.. code-block:: shell
......@@ -20,6 +27,7 @@ Examples of requests to the Web Service
# Get the translations of a string
$ GET http://127.0.0.1:5000/api/translation?q={"filters":[{"name":"original","op":"eq","val":"Name of shelter"}]}
<<<<<<< HEAD
=======
Web Services
============
......@@ -43,3 +51,5 @@ Example of requests to the Web Service
# Get the translations of a string
$ GET http://127.0.0.1:5000/api/translation?q={"filters":[{"name":"original","op":"eq","val":"Name of shelter"}]}
>>>>>>> 011351c71fefe44d232b84497307f51ee6d5b501
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
<<<<<<< HEAD
<<<<<<< HEAD
API v0.1
========
......@@ -15,6 +16,25 @@ Request parameters:
Examples
--------
=======
Web Services
============
Usage of the development API v0.1
---------------------------------
request parameters:
**attribute**: pass one or more attribute names, such as `<attribute=Name,Vegetation>`
NOTE: Currently the attribute names may contain capital letters and spaces.
Spaces should be substituted as `<%20>` int the URL, for example
`<Climate%20Zone>`. An alternative "coding-friendly" attribute naming will be implemented shortly,
as unique strings for each attribute whithout spaces and upper case letters.
**format**: use `<format=prettytext>` to get the nicely formatted attribute names in the JSON,
instead of the "coding-friendly" attribute names.
Examples:
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
.. code-block:: shell
......@@ -41,6 +61,7 @@ Examples
http://0.0.0.0:5000/api/v0.1/shelters/Kitchen type/open fire
#get all shelters which have a specific attribute value
<<<<<<< HEAD
=======
Web Services
============
......@@ -86,3 +107,5 @@ Examples:
http://0.0.0.0:5000/api/v0.1/shelters/Kitchen type/open fire
#get all shelters which have a specific attribute value
>>>>>>> 011351c71fefe44d232b84497307f51ee6d5b501
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
Deployment
==========
......@@ -226,6 +229,7 @@ Configuring Tomcat to use the Keystore. pen the Apache Tomcat server configurati
nano /etc/tomcat7/server.xml
<<<<<<< HEAD
Add the following under the existing commented out connector for SSL. Make sure to change the keystorepassword and set the maxThreads to 200 * number of CPU cores
.. code-block:: shell
......@@ -238,11 +242,22 @@ Add the following under the existing commented out connector for SSL. Make sure
nano /etc/default/tomcat7
In JAVA_OPTS you should set a higher value for the maximum heap size (xmx) for example -Xmx1024m (depending on the ressources available and the expected load) instead of the initial 128. Also you should add the initial heap size parameter (xms) and set it's value to the same one as xsx, e.g. -Xms1024m
=======
add the following under the existing commented out connector for SSL. Make sure to change the keystorepassword and set the maxThreads to 200 * number of CPU cores
<Connector SSLEnabled="true" acceptCount="100" clientAuth="false" disableUploadTimeout="true" enableLookups="false" maxThreads="25" port="8444" keystoreFile="/etc/tomcat7/.keystore" keystorePass="verysecretpassword" protocol="org.apache.coyote.http11.Http11NioProtocol" scheme="https" secure="true" sslProtocol="TLS" />
nano /etc/default/tomcat7
in JAVA_OPTS you should set a higher value for the maximum heap size (xmx) for example -Xmx1024m (depending on the ressources available and the expected load) instead of the initial 128. Also you should add the initial heap size parameter (xms) and set it's value to the same one as xsx, e.g. -Xms1024m
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
Now let's restart tomcat 7 to reload the configuration.
.. code-block:: shell
<<<<<<< HEAD
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
sudo service tomcat7 restart
Download and install Geoserver
......@@ -377,9 +392,14 @@ Enable the site:
The web application is now running with a dedicated user and a thread limit set
to 5.
<<<<<<< HEAD
Update stylesheets
""""""""""""""""""
=======
Update stylesheets
"""""""""
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
.. code-block:: shell
......@@ -409,6 +429,7 @@ Two layers are used by the Shelter Database application:
* `Köppen–Geiger climate classification system <https://shelter-database.org:8443/geoserver/shelters/wms?service=WMS&version=1.1.0&request=GetMap&layers=shelters:koeppen-geiger&styles=&bbox=-180.24500000476837,-90.2449951171875,180.2449951171875,84.22234392166138&width=768&height=371&srs=EPSG:4326&format=application/openlayers>`_;
* `Red Cross climate classification system <https://shelter-database.org:8443/geoserver/shelters/wms?service=WMS&version=1.1.0&request=GetMap&layers=shelters:redcross&styles=&bbox=-180.24500000476837,-90.2449951171875,180.2449951171875,84.22234392166138&width=768&height=371&srs=EPSG:4326&format=application/openlayers>`_.
<<<<<<< HEAD
=======
Deployment
==========
......@@ -813,3 +834,5 @@ Two layers are used by the Shelter Database application:
* `Köppen–Geiger climate classification system <https://shelter-database.org:8443/geoserver/shelters/wms?service=WMS&version=1.1.0&request=GetMap&layers=shelters:koeppen-geiger&styles=&bbox=-180.24500000476837,-90.2449951171875,180.2449951171875,84.22234392166138&width=768&height=371&srs=EPSG:4326&format=application/openlayers>`_;
* `Red Cross climate classification system <https://shelter-database.org:8443/geoserver/shelters/wms?service=WMS&version=1.1.0&request=GetMap&layers=shelters:redcross&styles=&bbox=-180.24500000476837,-90.2449951171875,180.2449951171875,84.22234392166138&width=768&height=371&srs=EPSG:4326&format=application/openlayers>`_.
>>>>>>> 011351c71fefe44d232b84497307f51ee6d5b501
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
<<<<<<< HEAD
<<<<<<< HEAD
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
.. Shelter Database documentation master file, created by
sphinx-quickstart on Sun Jun 19 21:53:46 2016.
You can adapt this file completely to your liking, but it should at least
......@@ -40,6 +43,7 @@ Web Services
:maxdepth: 2
api
<<<<<<< HEAD
api_v0.1
=======
.. Shelter Database documentation master file, created by
......@@ -84,3 +88,5 @@ Web Services
api
>>>>>>> 011351c71fefe44d232b84497307f51ee6d5b501
=======
>>>>>>> b6b3759e10b96db233dac9cadc04365ff404dd97
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment