[airavata-django-portal] 01/01: Merge pull request #16 from gowtham06/simccs

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch simccs
in repository https://gitbox.apache.org/repos/asf/airavata-django-portal.git

commit 5d32f286558f23d8783555fc380e4fd765d98219
Merge: 3ef27fd ce5dff1
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Oct 10 16:26:55 2018 -0400

    Merge pull request #16 from gowtham06/simccs
    
    Adding France sources and Sinks

 .../apps/maptool/static/Data/France_Sink.json      |   1 +
 .../apps/maptool/static/Data/France_Source.json    |   1 +
 django_airavata/apps/maptool/static/images/GHG.png | Bin 0 -> 118495 bytes
 .../apps/maptool/static/images/co2_image.png       | Bin 0 -> 29739 bytes
 .../apps/maptool/static/images/co2_injection.jpg   | Bin 0 -> 34739 bytes
 .../apps/maptool/static/images/co2_red_icon.png    | Bin 0 -> 67573 bytes
 .../apps/maptool/static/images/co2_suppliers.png   | Bin 0 -> 2755 bytes
 .../apps/maptool/static/images/coal.jpeg           | Bin 0 -> 14029 bytes
 .../apps/maptool/static/images/industry_gas.jpeg   | Bin 0 -> 14592 bytes
 .../apps/maptool/static/images/metal.png           | Bin 0 -> 106901 bytes
 .../apps/maptool/static/images/mineral.png         | Bin 0 -> 3829 bytes
 .../apps/maptool/static/images/natural_gas.png     | Bin 0 -> 931 bytes
 .../maptool/static/images/petrol_natural_gas.png   | Bin 0 -> 10825 bytes
 .../apps/maptool/static/images/petroleum_icon.png  | Bin 0 -> 24345 bytes
 .../apps/maptool/static/images/power_plant.png     | Bin 0 -> 4952 bytes
 .../apps/maptool/static/images/pulp.png            | Bin 0 -> 8374 bytes
 .../apps/maptool/static/images/refinery.png        | Bin 0 -> 34058 bytes
 .../apps/maptool/static/images/waste.png           | Bin 0 -> 19874 bytes
 .../apps/maptool/static/js/leafletMap.js           | 225 ++++++++++++++++-----
 django_airavata/apps/maptool/templates/index.html  |  22 +-
 20 files changed, 193 insertions(+), 56 deletions(-)