geojson edits

CIROH-UA · Jan 8, 2024 · 505d716 · 505d716
1 parent 9ab9196
commit 505d716
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/scripts/stream.sh b/scripts/stream.sh
@@ -91,36 +91,38 @@ else
     NGEN_CONF_PATH="${DATASTREAM_RESOURCES_CONFIGS%/}/config.ini"
     NGEN_REAL_DEFAULT="https://ngenresourcesdev.s3.us-east-2.amazonaws.com/ngen-run-pass/configs/realization.json"
     NGEN_REAL_PATH="${DATASTREAM_RESOURCES_CONFIGS%/}/realization.json"
-    # GEOPACKAGE="conus.gpkg"
-    # GEOPACKAGE_DEFAULT="https://lynker-spatial.s3.amazonaws.com/v20.1/$GEOPACKAGE"
-    # GEOPACKAGE_PATH="${DATASTREAM_RESOURCES%/}/$GEOPACKAGE"
-    # Talk to Mike about having hfsubset generate this
+
     WEIGHTS_DEFAULT="https://ngenresourcesdev.s3.us-east-2.amazonaws.com/weights_conus_v21.json"
     WEIGHTS_PATH="${DATASTREAM_RESOURCES%/}/weights_conus.json"
 
-    # wget -O $GEOPACKAGE_PATH $GEOPACKAGE_DEFAULT
     wget -O $GRID_FILE_PATH $GRID_FILE_DEFAULT
     wget -O $NGEN_CONF_PATH $NGEN_CONF_DEFAULT
     wget -O $NGEN_REAL_PATH $NGEN_REAL_DEFAULT
     wget -O $WEIGHTS_PATH $WEIGHTS_DEFAULT
 
+    # GEOPACKAGE="conus.gpkg"
+    # GEOPACKAGE_DEFAULT="https://lynker-spatial.s3.amazonaws.com/v20.1/$GEOPACKAGE"
+    # GEOPACKAGE_PATH="${DATASTREAM_RESOURCES%/}/$GEOPACKAGE"    
+    # wget -O $GEOPACKAGE_PATH $GEOPACKAGE_DEFAULT
     # Remove when ngen image can handle geopackage
     CATCHMENTS_DEFAULT="https://ngenresourcesdev.s3.us-east-2.amazonaws.com/catchments_conus_v21.geojson"
     CATCHMENTS_PATH="${DATASTREAM_RESOURCES%/}/catchments.geojson"
     NEXUS_DEFAULT="https://ngenresourcesdev.s3.us-east-2.amazonaws.com/nexus_conus_v21.geojson"
     NEXUS_PATH="${DATASTREAM_RESOURCES%/}/nexus.geojson"   
     wget -O $CATCHMENTS_PATH $CATCHMENTS_DEFAULT
     wget -O $NEXUS_PATH $NEXUS_DEFAULT   
+
 
 fi
 
 NGEN_CONFS="${DATASTREAM_RESOURCES%/}/ngen-configs/*"
 cp $NGEN_CONFS $NGEN_CONFIG_PATH
 
 if [ -e $GEOPACKAGE_PATH ]; then
-    echo "Using geopackage" $GEOPACKAGE
-    # Fix then ngen image can handle geopackage
+    # Fix when ngen image can handle geopackage
+    # echo "Using geopackage" $GEOPACKAGE
     # cp $GEOPACKAGE_PATH $NGEN_CONFIG_PATH
+    echo "Using geojsons" $CATCHMENTS_PATH $NEXUS_PATH
     cp $CATCHMENTS_PATH $NGEN_CONFIG_PATH
     cp $NEXUS_PATH $NGEN_CONFIG_PATH
 else