You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@airavata.apache.org by ma...@apache.org on 2019/03/05 20:21:19 UTC

[airavata-django-portal] branch simccs updated (05c7e65 -> 6be5781)

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

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


    from 05c7e65  Merge branch 'master' into simccs
     new 4cc9377  demo work checked in
     new e6a495e  layer control demo
     new 35f5c52  cost surface as wms layer
     new 208f116  layer control on define work area
     new 1233ec9  commit before merge
     new 6be5781  Merge pull request #20 from webgisdeveloper/simccs

The 683 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../static/Data/result_network_110MTyr.geojson     |  89 ++++++++
 .../static/Data/result_network_50MTyr.geojson      |  33 +++
 .../static/Data/result_network_5MTyr.geojson       |  14 ++
 .../apps/maptool/static/Data/result_sink.geojson   |  14 ++
 .../apps/maptool/static/Data/result_source.geojson |  27 +++
 .../apps/maptool/static/js/leafletMap.js           |  73 ++++++-
 django_airavata/apps/maptool/templates/index.html  | 227 +++++++++++++++++++--
 7 files changed, 455 insertions(+), 22 deletions(-)
 create mode 100644 django_airavata/apps/maptool/static/Data/result_network_110MTyr.geojson
 create mode 100644 django_airavata/apps/maptool/static/Data/result_network_50MTyr.geojson
 create mode 100644 django_airavata/apps/maptool/static/Data/result_network_5MTyr.geojson
 create mode 100644 django_airavata/apps/maptool/static/Data/result_sink.geojson
 create mode 100644 django_airavata/apps/maptool/static/Data/result_source.geojson