changing XSD paths

Riverscapes · Oct 5, 2022 · 1e4322b · 1e4322b
1 parent cd1747d
commit 1e4322b
Show file tree

Hide file tree

Showing 26 changed files with 31 additions and 31 deletions.
diff --git a/examples/gis_tool.py b/examples/gis_tool.py
@@ -24,7 +24,7 @@
 
 # Setting up our model with an XSD will let us refer to it later
 # The version should be your tool version. Usually this is stored in a __version__.py file
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/MYTOOLHERE.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/MYTOOLHERE.xsd', __version__)
 
 
 def run(my_arg1: str, my_arg2: int):

diff --git a/examples/project_xml.py b/examples/project_xml.py
@@ -20,7 +20,7 @@
 """
 
 # Set up a class to track thigns like default EPSG, xsd validation and tool version
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/Inundation.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/Inundation.xsd', __version__)
 
 # Define the types of layers we're going to use up top so we can re-use them later
 # We use our handy RSLayer() class here.

diff --git a/lib/commons/rscommons/classes/rs_project.py b/lib/commons/rscommons/classes/rs_project.py
@@ -57,7 +57,7 @@ class RSMetaTypes:
     """
     This is a helper enumeration class to make sure we only use meta types that are valid.
     These should exactly mirror:
-        https://xml.riverscapes.xyz/Projects/XSD/V1/RiverscapesProject.xsd
+        https://xml.riverscapes.net/Projects/XSD/V1/RiverscapesProject.xsd
     """
     GUID = "guid"
     URL = "url"
@@ -600,7 +600,7 @@ def rs_copy_project_extents(self, in_prj_path):
         geojson_filename = project_extent_node.find('Path').text
         in_geojson_path = os.path.join(os.path.dirname(in_prj_path), geojson_filename)
         out_geojson_path = os.path.join(os.path.dirname(self.xml_path), geojson_filename)
-        
+
         if not os.path.exists(out_geojson_path):
             shutil.copy(in_geojson_path, out_geojson_path)
 

diff --git a/lib/commons/rscommons/report/templates/report.css b/lib/commons/rscommons/report/templates/report.css
@@ -144,7 +144,7 @@ section.report-section>.report-header{
 #HeaderBar .projectType{ float: left}
 #HeaderBar .projectType{ float: left}
 #RiverscapesLogo {
-  background-image: url(https://riverscapes.xyz/assets/images/RiverscapesLogo.png);
+  background-image: url(https://riverscapes.net/assets/images/RiverscapesLogo.png);
   background-size: contain;
   background-repeat: no-repeat;
   flex: 0 0 6%;
@@ -161,7 +161,7 @@ section.report-section>.report-header{
   text-shadow: 3px 3px 3px rgba(0,0,0,0.7);
   background-size: cover;
   background-color: #444444;
-  background-image: url(https://data.riverscapes.xyz/HeaderBackground.png);
+  background-image: url(https://data.riverscapes.net/HeaderBackground.png);
   background-repeat: no-repeat;
   background-position: 0% 50%;
 }
@@ -323,7 +323,7 @@ footer #FooterLeft {
 }
 footer #FooterRight {
   flex: 1 1 30%;
-  background-image: url(https://data.riverscapes.xyz/cc-watermarks-riverscapes_orig.png);
+  background-image: url(https://data.riverscapes.net/cc-watermarks-riverscapes_orig.png);
   background-size: contain;
   background-repeat: no-repeat;
   background-position: center center;  

diff --git a/packages/brat/docs/assets/js/dist.js b/packages/brat/docs/assets/js/dist.js
diff --git a/packages/brat/scripts/fm_ltpbr.py b/packages/brat/scripts/fm_ltpbr.py
@@ -13,7 +13,7 @@
 import csv
 from sqlbrat.__version__ import __version__
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/fmLTPBR.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/fmLTPBR.xsd', __version__)
 # Don't forgbet to pip install dbfread. I didn't add it to requirements.txt
 
 LayerTypes = {

diff --git a/packages/brat/sqlbrat/brat_build.py b/packages/brat/sqlbrat/brat_build.py
@@ -32,7 +32,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/BRAT.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/BRAT.xsd', __version__)
 
 LayerTypes = {
     'DEM': RSLayer('NED 10m DEM', 'DEM', 'DEM', 'inputs/dem.tif'),

diff --git a/packages/brat/sqlbrat/brat_report.py b/packages/brat/sqlbrat/brat_report.py
@@ -150,7 +150,7 @@ def __init__(self, database, report_path, rs_project):
         outputs_section = self.section('Outputs', 'Model Outputs')
         pEl = ET.Element('p')
         pEl.text = 'This report summarizes the model outputs for a particular run of BRAT, and provides some information on the input data used and intermediate data generated. For more detailed model documentation, visit the '
-        aEl = ET.SubElement(pEl, 'a', {'href': 'https://tools.riverscapes.xyz/brat'})
+        aEl = ET.SubElement(pEl, 'a', {'href': 'https://tools.riverscapes.net/brat'})
         aEl.text = 'BRAT Documentation'
         outputs_section.append(pEl)
         self.dam_capacity(outputs_section)
@@ -841,7 +841,7 @@ def _dict_factory(cursor, row):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/BRAT.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/BRAT.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = BratReport(args.database, args.report_path, project)
     report.write()
diff --git a/packages/brat/sqlbrat/brat_run.py b/packages/brat/sqlbrat/brat_run.py
@@ -28,7 +28,7 @@
 from sqlbrat.brat_report import BratReport
 from sqlbrat.__version__ import __version__
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/BRAT.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/BRAT.xsd', __version__)
 
 # Dictionary of fields that this process outputs, keyed by ShapeFile data type
 output_fields = {

diff --git a/packages/channel/channel/channel.py b/packages/channel/channel/channel.py
@@ -34,7 +34,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/ChannelArea.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/ChannelArea.xsd', __version__)
 
 LayerTypes = {
     'INPUTS': RSLayer('Inputs', 'INPUTS', 'Geopackage', 'inputs/inputs.gpkg', {

diff --git a/packages/channel/channel/channel_report.py b/packages/channel/channel/channel_report.py
@@ -47,7 +47,7 @@ def layersummary(self, xml_id: str, name: str):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/RSContext.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/RSContext.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = ChannelReport(args.report_path, project)
     report.write()
diff --git a/packages/gnat/gnat/confinement.py b/packages/gnat/gnat/confinement.py
@@ -34,7 +34,7 @@
 initGDALOGRErrors()
 gdal.UseExceptions()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/Confinement.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/Confinement.xsd', __version__)
 
 LayerTypes = {
     # key: (name, id, tag, relpath)]

diff --git a/packages/gnat/gnat/gnat.py b/packages/gnat/gnat/gnat.py
@@ -25,7 +25,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/GNAT.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/GNAT.xsd', __version__)
 
 LayerTypes = {
     # key: (name, id, tag, relpath)

diff --git a/packages/gnat/gnat/utils/confinement_report.py b/packages/gnat/gnat/utils/confinement_report.py
@@ -107,7 +107,7 @@ def _dict_factory(cursor, row):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/Confinement.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/Confinement.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = ConfinementReport(args.database, args.report_path, project)
     report.write()
diff --git a/packages/gnat/gnat/utils/gnat_report.py b/packages/gnat/gnat/utils/gnat_report.py
@@ -29,7 +29,7 @@ def __init__(self, database, report_path, rs_project):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/GNAT.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/GNAT.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = GNATReport(args.database, args.report_path, project)
     report.write()
diff --git a/packages/hand/hand/hand.py b/packages/hand/hand/hand.py
@@ -34,7 +34,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/HAND.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/HAND.xsd', __version__)
 
 LayerTypes = {
     'DEM': RSLayer('DEM', 'DEM', 'Raster', 'inputs/dem.tif'),

diff --git a/packages/hand/hand/hand_report.py b/packages/hand/hand/hand_report.py
@@ -36,7 +36,7 @@ def report_intro(self):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/HAND.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/HAND.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = HANDReport(args.report_path, project)
     report.write()
diff --git a/packages/rscontext/rscontext/rs_context.py b/packages/rscontext/rscontext/rs_context.py
@@ -45,7 +45,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/RSContext.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/RSContext.xsd', __version__)
 
 # These are the Prism BIL types we expect
 PrismTypes = ['PPT', 'TMEAN', 'TMIN', 'TMAX', 'TDMEAN', 'VPDMIN', 'VPDMAX']
@@ -395,7 +395,7 @@ def augment_layermeta():
         if k in json_data and len(json_data[k]) > 0:
             lyr.lyr_meta = [
                 RSMeta('Description', json_data[k]),
-                RSMeta('DocsUrl', 'https://tools.riverscapes.xyz/rscontext/data.html#{}'.format(lyr.id), RSMetaTypes.URL)
+                RSMeta('DocsUrl', 'https://tools.riverscapes.net/rscontext/data.html#{}'.format(lyr.id), RSMetaTypes.URL)
             ]
 
 

diff --git a/packages/rscontext/rscontext/rs_context_report.py b/packages/rscontext/rscontext/rs_context_report.py
@@ -36,7 +36,7 @@ def report_intro(self):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/RSContext.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/RSContext.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = RSContextReport(args.report_path, project, os.path.dirname(args.projectxml))
     report.write()
diff --git a/packages/rscontext/scripts/modis_xmls.py b/packages/rscontext/scripts/modis_xmls.py
@@ -10,7 +10,7 @@
 from rscommons.classes.rs_project import RSMeta, RSMetaTypes
 from rscommons.util import safe_makedirs, safe_remove_file
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/LST.xsd', '0.0.1')
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/LST.xsd', '0.0.1')
 
 
 def process_lst(lst_xml_folder):

diff --git a/packages/rvd/rvd/rvd.py b/packages/rvd/rvd/rvd.py
@@ -40,7 +40,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/RVD.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/RVD.xsd', __version__)
 
 LayerTypes = {
     # key: (name, id, tag, relpath)

diff --git a/packages/rvd/rvd/rvd_report.py b/packages/rvd/rvd/rvd_report.py
@@ -36,7 +36,7 @@ def report_intro(self):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/RVD.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/RVD.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = RVDReport(args.report_path, project, os.path.dirname(args.projectxml))
     report.write()
diff --git a/packages/taudem/taudem/taudem.py b/packages/taudem/taudem/taudem.py
@@ -35,7 +35,7 @@
 
 Path = str
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/TauDEM.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/TauDEM.xsd', __version__)
 
 NCORES = os.environ['TAUDEM_CORES'] if 'TAUDEM_CORES' in os.environ else '2'
 

diff --git a/packages/taudem/taudem/taudem_report.py b/packages/taudem/taudem/taudem_report.py
@@ -35,7 +35,7 @@ def report_intro(self):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/TauDEM.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/TauDEM.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = TauDEMReport(args.report_path, project)
     report.write()
diff --git a/packages/vbet/vbet/vbet.py b/packages/vbet/vbet/vbet.py
@@ -47,7 +47,7 @@
 
 initGDALOGRErrors()
 
-cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/VBET.xsd', __version__)
+cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/VBET.xsd', __version__)
 
 LayerTypes = {
     'DEM': RSLayer('DEM', 'DEM', 'Raster', 'inputs/dem.tif'),

diff --git a/packages/vbet/vbet/vbet_report.py b/packages/vbet/vbet/vbet_report.py
@@ -83,7 +83,7 @@ def transforms(self):
     parser.add_argument('report_path', help='Output path where report will be generated', type=str)
     args = dotenv.parse_args_env(parser)
 
-    cfg = ModelConfig('http://xml.riverscapes.xyz/Projects/XSD/V1/VBET.xsd', __version__)
+    cfg = ModelConfig('http://xml.riverscapes.net/Projects/XSD/V1/VBET.xsd', __version__)
     project = RSProject(cfg, args.projectxml)
     report = VBETReport(args.report_path, project)
     report.write()