config.yml
| @@ -10,7 +10,7 @@ |
| # The current version of your application. This will be advertised |
| # through your REST API, and should take the form |
| # "<major_version>.<minor_version>.<patch>". |
| -version: 0.3.4 |
| +version: 0.3.5 |
| |
| # The kind of application. Currently eRAMS supports two kinds of applications, `system` and `app`. |
| # System apps have pre-configured installation and configurations, while all `app` applications are |
install.py
| @@ -90,7 +90,7 @@ |
| shutil.copytree( |
| src_dir, |
| os.path.join(tmp_dir, "app"), |
| - ignore=shutil.ignore_patterns("node_modules"), |
| + ignore=shutil.ignore_patterns("node_modules", ".hg"), |
| ) |
| shutil.move(tmp_dir, dest_dir) |
| |
services.py
| @@ -384,6 +384,7 @@ |
| huc_re = re.compile(r"^huc\d+$") |
| if len(data) > 0: |
| data = data[0] |
| + huc_names = [] |
| if "subregion" in data: |
| if "features" in data["subregion"]: |
| self.result = {"features": data["subregion"]["features"]} |
| @@ -421,6 +422,12 @@ |
| table_row["name"] = table_row["name_huc"] |
| feature["properties"]["name"] = table_row["name_huc"] |
| feature["properties"]["name_huc"] = table_row["name_huc"] |
| + |
| + # Check for duplicate names |
| + if table_row["name"] in huc_names: |
| + table_row["name"] = table_row["name"] + " (1)" |
| + feature["properties"]["name"] = table_row["name"] |
| + huc_names.append(table_row["name"]) |
| table_data.append(table_row) |
| if "state_minmax" in data and "rows" in data["state_minmax"]: |
| rows = data["state_minmax"]["rows"] |
| @@ -518,7 +525,8 @@ |
| |
| c = csip.utils.Client() |
| url = ( |
| - "http://csip.engr.colostate.edu:8088/csip-mcda/m/mcda/comparisonmethods/1.0" |
| + # "http://csip.engr.colostate.edu:8088/csip-mcda/m/mcda/comparisonmethods/1.0" |
| + "http://localhost:8080/csip-mcda/m/mcda/comparisonmethods/1.0" |
| ) |
| c = c.get_capabilities(url) |
| c.set_data_value("model_type", "WAM") |
static/package.json
| @@ -1,6 +1,6 @@ |
| { |
| "name": "er2_watershedpriority", |
| - "version": "0.3.4", |
| + "version": "0.3.5", |
| "target": "web", |
| "module": "index.js", |
| "license": "MIT", |