From 06410f307054b3b3b8455d2d96fd9557d662361a Mon Sep 17 00:00:00 2001 From: Chloe Seeborg Date: Mon, 13 Jan 2025 11:41:55 -0700 Subject: [PATCH] Curation changes/updates for RSContext --- Symbology/arcpro/Shared/canals_ditches.lyrx | 53 +- Symbology/arcpro/Shared/flow_lines.lyrx | 220 +- Symbology/arcpro/Shared/railroads.lyrx | 6 +- Symbology/arcpro/Shared/roads.lyrx | 643 +++-- Symbology/qgis/RSContext/geo.qml | 2079 +++++++++-------- Symbology/qgis/Shared/canals_ditches.qml | 415 +++- Symbology/qgis/Shared/flow_lines.qml | 1365 ++++------- Symbology/qgis/Shared/railroads.qml | 870 ++++--- Symbology/web/RSContext/fair_market.txt | 13 + Symbology/web/RSContext/wbdhu10.json | 2 +- Symbology/web/RSContext/wbdhu12.json | 2 +- Symbology/web/RSContext/wbdhu2.json | 2 +- Symbology/web/RSContext/wbdhu4.json | 2 +- Symbology/web/RSContext/wbdhu6.json | 2 +- Symbology/web/RSContext/wbdhu8.json | 2 +- Symbology/web/Shared/canals_ditches.json | 23 +- Symbology/web/Shared/flow_lines.json | 93 +- Symbology/web/Shared/railroads.json | 6 +- Symbology/web/Shared/roads.json | 4 +- .../web/Shared/upstreamdrainagearea.json | 109 +- 20 files changed, 2905 insertions(+), 3006 deletions(-) create mode 100644 Symbology/web/RSContext/fair_market.txt diff --git a/Symbology/arcpro/Shared/canals_ditches.lyrx b/Symbology/arcpro/Shared/canals_ditches.lyrx index 1d68bfd2..3d7d73bb 100644 --- a/Symbology/arcpro/Shared/canals_ditches.lyrx +++ b/Symbology/arcpro/Shared/canals_ditches.lyrx @@ -8,7 +8,7 @@ "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "canals", + "name" : "Canals and Ditches", "uRI" : "CIMPATH=map/canals.json", "sourceModifiedTime" : { "type" : "TimeInstant" @@ -34,7 +34,7 @@ "autoGenerateFeatureTemplates" : true, "featureTable" : { "type" : "CIMFeatureTable", - "displayField" : "FID", + "displayField" : "FID_1", "editable" : true, "fieldDescriptions" : [ { @@ -58,6 +58,20 @@ "fieldName" : "Shape", "visible" : true, "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "FID_1", + "fieldName" : "FID_1", + "numberFormat" : { + "type" : "CIMNumericFormat", + "alignmentOption" : "esriAlignRight", + "alignmentWidth" : 0, + "roundingOption" : "esriRoundNumberOfDecimals", + "roundingValue" : 6 + }, + "visible" : true, + "searchMode" : "Exact" } ], "timeFields" : { @@ -74,7 +88,7 @@ }, "dataConnection" : { "type" : "CIMStandardDataConnection", - "workspaceConnectionString" : "DATABASE=..\\..\\..\\..\\1701020301_landers\\Riverscapes_Context_Landers\\transportation", + "workspaceConnectionString" : "DATABASE=..\\..\\..\\1602020402_bigcottonwood\\Riverscapes_Context_BigCottonwood\\transportation", "workspaceFactory" : "Shapefile", "dataset" : "canals.shp", "datasetType" : "esriDTFeatureClass" @@ -334,20 +348,20 @@ "symbolLayers" : [ { "type" : "CIMVectorMarker", - "enable" : true, + "enable" : false, "anchorPointUnits" : "Relative", "dominantSizeAxis3D" : "Z", "rotation" : 90, - "size" : 1, + "size" : 2, "billboardMode3D" : "None", "markerPlacement" : { "type" : "CIMMarkerPlacementAlongLineSameSize", "placePerPart" : true, "angleToLine" : true, "endings" : "NoConstraint", - "offsetAlongLine" : 4.5, + "offsetAlongLine" : 9, "placementTemplate" : [ - 5 + 10 ] }, "frame" : { @@ -389,9 +403,9 @@ "color" : { "type" : "CIMRGBColor", "values" : [ - 163, - 242, - 242, + 115, + 223, + 255, 100 ] } @@ -409,8 +423,17 @@ { "type" : "CIMGeometricEffectOffset", "method" : "Rounded", - "offset" : 1.3, + "offset" : 2.6000000000000001, "option" : "Fast" + }, + { + "type" : "CIMGeometricEffectDashes", + "dashTemplate" : [ + 4, + 3 + ], + "lineDashEnding" : "NoConstraint", + "controlPointEnding" : "NoConstraint" } ], "enable" : true, @@ -418,15 +441,15 @@ "joinStyle" : "Round", "lineStyle3D" : "Strip", "miterLimit" : 10, - "width" : 0.13333333333333333, + "width" : 1, "height3D" : 1, "anchor3D" : "Center", "color" : { "type" : "CIMRGBColor", "values" : [ - 163, - 242, - 242, + 115, + 223, + 255, 100 ] } diff --git a/Symbology/arcpro/Shared/flow_lines.lyrx b/Symbology/arcpro/Shared/flow_lines.lyrx index 53729f58..6cc330ec 100644 --- a/Symbology/arcpro/Shared/flow_lines.lyrx +++ b/Symbology/arcpro/Shared/flow_lines.lyrx @@ -3,23 +3,43 @@ "version" : "3.3.0", "build" : 52636, "layers" : [ - "CIMPATH=map/nhdflowline.json" + "CIMPATH=map/full_nhd_hr__drainage_network.json" ], "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "NHDFlowline", - "uRI" : "CIMPATH=map/nhdflowline.json", + "name" : "Full NHD HR+ Drainage Network", + "uRI" : "CIMPATH=map/full_nhd_hr__drainage_network.json", "sourceModifiedTime" : { "type" : "TimeInstant" }, - "metadataURI" : "CIMPATH=Metadata/c25c8f0b5a27383511ea9cb899f46b64.xml", - "useSourceMetadata" : false, + "useSourceMetadata" : true, + "description" : "Full NHD HR+ Drainage Network", "layerElevation" : { "type" : "CIMLayerElevationSurface", "elevationSurfaceLayerURI" : "CIMPATH=Map/7d7072e6416e464682803d99a9d3d585.json" }, "expanded" : true, + "layer3DProperties" : { + "type" : "CIM3DLayerProperties", + "castShadows" : true, + "isLayerLit" : true, + "layerFaceCulling" : "None", + "maxDistance" : -1, + "minDistance" : -1, + "preloadTextureCutoffHigh" : 0, + "preloadTextureCutoffLow" : 0.25, + "textureCutoffHigh" : 0.25, + "textureCutoffLow" : 1, + "useCompressedTextures" : true, + "verticalExaggeration" : 1, + "exaggerationMode" : "ScaleZ", + "verticalUnit" : { + "uwkid" : 9001 + }, + "lighting" : "OneSideDataNormal", + "optimizeMarkerTransparency" : true + }, "layerType" : "Operational", "showLegends" : true, "visibility" : true, @@ -34,7 +54,7 @@ "autoGenerateFeatureTemplates" : true, "featureTable" : { "type" : "CIMFeatureTable", - "displayField" : "GNIS_Name", + "displayField" : "gnis_name", "editable" : true, "fieldDescriptions" : [ { @@ -61,22 +81,22 @@ }, { "type" : "CIMFieldDescription", - "alias" : "Permanent_", - "fieldName" : "Permanent_", + "alias" : "permanent_", + "fieldName" : "permanent_", "visible" : true, "searchMode" : "Exact" }, { "type" : "CIMFieldDescription", - "alias" : "FDate", - "fieldName" : "FDate", + "alias" : "fdate", + "fieldName" : "fdate", "visible" : true, "searchMode" : "Exact" }, { "type" : "CIMFieldDescription", - "alias" : "Resolution", - "fieldName" : "Resolution", + "alias" : "resolution", + "fieldName" : "resolution", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -89,22 +109,22 @@ }, { "type" : "CIMFieldDescription", - "alias" : "GNIS_ID", - "fieldName" : "GNIS_ID", + "alias" : "gnis_id", + "fieldName" : "gnis_id", "visible" : true, "searchMode" : "Exact" }, { "type" : "CIMFieldDescription", - "alias" : "GNIS_Name", - "fieldName" : "GNIS_Name", + "alias" : "gnis_name", + "fieldName" : "gnis_name", "visible" : true, "searchMode" : "Exact" }, { "type" : "CIMFieldDescription", - "alias" : "LengthKM", - "fieldName" : "LengthKM", + "alias" : "lengthkm", + "fieldName" : "lengthkm", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -117,15 +137,15 @@ }, { "type" : "CIMFieldDescription", - "alias" : "ReachCode", - "fieldName" : "ReachCode", + "alias" : "reachcode", + "fieldName" : "reachcode", "visible" : true, "searchMode" : "Exact" }, { "type" : "CIMFieldDescription", - "alias" : "FlowDir", - "fieldName" : "FlowDir", + "alias" : "flowdir", + "fieldName" : "flowdir", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -138,15 +158,15 @@ }, { "type" : "CIMFieldDescription", - "alias" : "WBArea_Per", - "fieldName" : "WBArea_Per", + "alias" : "wbarea_per", + "fieldName" : "wbarea_per", "visible" : true, "searchMode" : "Exact" }, { "type" : "CIMFieldDescription", - "alias" : "FType", - "fieldName" : "FType", + "alias" : "ftype", + "fieldName" : "ftype", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -159,8 +179,8 @@ }, { "type" : "CIMFieldDescription", - "alias" : "FCode", - "fieldName" : "FCode", + "alias" : "fcode", + "fieldName" : "fcode", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -173,8 +193,8 @@ }, { "type" : "CIMFieldDescription", - "alias" : "MainPath", - "fieldName" : "MainPath", + "alias" : "mainpath", + "fieldName" : "mainpath", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -187,8 +207,8 @@ }, { "type" : "CIMFieldDescription", - "alias" : "InNetwork", - "fieldName" : "InNetwork", + "alias" : "innetwork", + "fieldName" : "innetwork", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -201,8 +221,8 @@ }, { "type" : "CIMFieldDescription", - "alias" : "Visibility", - "fieldName" : "Visibility", + "alias" : "visibility", + "fieldName" : "visibility", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -215,8 +235,8 @@ }, { "type" : "CIMFieldDescription", - "alias" : "Shape_Leng", - "fieldName" : "Shape_Leng", + "alias" : "nhdplusid", + "fieldName" : "nhdplusid", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -229,8 +249,15 @@ }, { "type" : "CIMFieldDescription", - "alias" : "NHDPlusID", - "fieldName" : "NHDPlusID", + "alias" : "vpuid", + "fieldName" : "vpuid", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "Shape_Leng", + "fieldName" : "Shape_Leng", "numberFormat" : { "type" : "CIMNumericFormat", "alignmentOption" : "esriAlignRight", @@ -241,13 +268,6 @@ "visible" : true, "searchMode" : "Exact" }, - { - "type" : "CIMFieldDescription", - "alias" : "VPUID", - "fieldName" : "VPUID", - "visible" : true, - "searchMode" : "Exact" - }, { "type" : "CIMFieldDescription", "alias" : "Enabled", @@ -362,11 +382,11 @@ }, "dataConnection" : { "type" : "CIMSqlQueryDataConnection", - "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\..\\1701020301_landers\\Riverscapes_Context_Landers\\hydrology\\nhdplushr.gpkg", + "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\1602020402_bigcottonwood\\Riverscapes_Context_BigCottonwood\\hydrology\\nhdplushr.gpkg", "workspaceFactory" : "Sql", "dataset" : "main.%NHDFlowline", "datasetType" : "esriDTFeatureClass", - "sqlQuery" : "select fid,geom,Permanent_,FDate,Resolution,GNIS_ID,GNIS_Name,LengthKM,ReachCode,FlowDir,WBArea_Per,FType,FCode,MainPath,InNetwork,Visibility,Shape_Leng,NHDPlusID,VPUID,Enabled,AreaSqKm,TotDASqKm,DivDASqKm,Slope,MaxElevSmo,MInElevSmo from main.NHDFlowline", + "sqlQuery" : "select fid,geom,permanent_,fdate,resolution,gnis_id,gnis_name,lengthkm,reachcode,flowdir,wbarea_per,ftype,fcode,mainpath,innetwork,visibility,nhdplusid,vpuid,Shape_Leng,Enabled,AreaSqKm,TotDASqKm,DivDASqKm,Slope,MaxElevSmo,MInElevSmo from main.NHDFlowline", "srid" : "4326", "spatialReference" : { "wkid" : 4326, @@ -387,9 +407,9 @@ "queryFields" : [ { "name" : "fid", - "type" : "esriFieldTypeInteger", + "type" : "esriFieldTypeBigInteger", "isNullable" : false, - "length" : 4, + "length" : 8, "precision" : 0, "scale" : 0, "required" : true, @@ -426,7 +446,7 @@ "dbmsType" : 8 }, { - "name" : "Permanent_", + "name" : "permanent_", "type" : "esriFieldTypeString", "isNullable" : true, "length" : 40, @@ -435,8 +455,8 @@ "dbmsType" : 5 }, { - "name" : "FDate", - "type" : "esriFieldTypeDate", + "name" : "fdate", + "type" : "esriFieldTypeDateOnly", "isNullable" : true, "length" : 8, "precision" : 0, @@ -444,7 +464,7 @@ "dbmsType" : 7 }, { - "name" : "Resolution", + "name" : "resolution", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -453,7 +473,7 @@ "dbmsType" : 2 }, { - "name" : "GNIS_ID", + "name" : "gnis_id", "type" : "esriFieldTypeString", "isNullable" : true, "length" : 10, @@ -462,7 +482,7 @@ "dbmsType" : 5 }, { - "name" : "GNIS_Name", + "name" : "gnis_name", "type" : "esriFieldTypeString", "isNullable" : true, "length" : 65, @@ -471,7 +491,7 @@ "dbmsType" : 5 }, { - "name" : "LengthKM", + "name" : "lengthkm", "type" : "esriFieldTypeDouble", "isNullable" : true, "length" : 8, @@ -480,7 +500,7 @@ "dbmsType" : 4 }, { - "name" : "ReachCode", + "name" : "reachcode", "type" : "esriFieldTypeString", "isNullable" : true, "length" : 14, @@ -489,7 +509,7 @@ "dbmsType" : 5 }, { - "name" : "FlowDir", + "name" : "flowdir", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -498,7 +518,7 @@ "dbmsType" : 2 }, { - "name" : "WBArea_Per", + "name" : "wbarea_per", "type" : "esriFieldTypeString", "isNullable" : true, "length" : 40, @@ -507,7 +527,7 @@ "dbmsType" : 5 }, { - "name" : "FType", + "name" : "ftype", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -516,7 +536,7 @@ "dbmsType" : 2 }, { - "name" : "FCode", + "name" : "fcode", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -525,7 +545,7 @@ "dbmsType" : 2 }, { - "name" : "MainPath", + "name" : "mainpath", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -534,7 +554,7 @@ "dbmsType" : 2 }, { - "name" : "InNetwork", + "name" : "innetwork", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -543,7 +563,7 @@ "dbmsType" : 2 }, { - "name" : "Visibility", + "name" : "visibility", "type" : "esriFieldTypeInteger", "isNullable" : true, "length" : 4, @@ -552,7 +572,7 @@ "dbmsType" : 2 }, { - "name" : "Shape_Leng", + "name" : "nhdplusid", "type" : "esriFieldTypeDouble", "isNullable" : true, "length" : 8, @@ -561,22 +581,22 @@ "dbmsType" : 4 }, { - "name" : "NHDPlusID", - "type" : "esriFieldTypeDouble", + "name" : "vpuid", + "type" : "esriFieldTypeString", "isNullable" : true, "length" : 8, "precision" : 0, "scale" : 0, - "dbmsType" : 4 + "dbmsType" : 5 }, { - "name" : "VPUID", - "type" : "esriFieldTypeString", + "name" : "Shape_Leng", + "type" : "esriFieldTypeDouble", "isNullable" : true, "length" : 8, "precision" : 0, "scale" : 0, - "dbmsType" : 5 + "dbmsType" : 4 }, { "name" : "Enabled", @@ -644,7 +664,7 @@ ], "spatialStorageType" : 11, "isTableBased" : true, - "mappedOIDFieldLength" : "OID32Bit" + "mappedOIDFieldLength" : "OID64Bit" }, "studyAreaSpatialRel" : "esriSpatialRelUndefined", "searchOrder" : "esriSearchOrderSpatial" @@ -657,35 +677,7 @@ }, "isFlattened" : true, "selectable" : true, - "selectionSymbol" : { - "type" : "CIMSymbolReference", - "symbol" : { - "type" : "CIMLineSymbol", - "symbolLayers" : [ - { - "type" : "CIMSolidStroke", - "enable" : true, - "capStyle" : "Round", - "joinStyle" : "Round", - "lineStyle3D" : "Strip", - "miterLimit" : 10, - "width" : 2, - "height3D" : 1, - "anchor3D" : "Center", - "color" : { - "type" : "CIMRGBColor", - "values" : [ - 0, - 255, - 255, - 100 - ] - } - } - ] - } - }, - "featureCacheType" : "None", + "featureCacheType" : "Session", "displayFiltersType" : "ByScale", "featureBlendingMode" : "Alpha", "layerEffectsMode" : "Layer", @@ -966,7 +958,7 @@ }, "defaultSymbolPatch" : "Default", "fields" : [ - "FCode" + "fcode" ], "groups" : [ { @@ -1143,7 +1135,7 @@ "symbolLayers" : [ { "type" : "CIMVectorMarker", - "enable" : true, + "enable" : false, "anchorPointUnits" : "Relative", "dominantSizeAxis3D" : "Z", "rotation" : 90, @@ -1220,6 +1212,15 @@ "method" : "Rounded", "offset" : 1.3, "option" : "Fast" + }, + { + "type" : "CIMGeometricEffectDashes", + "dashTemplate" : [ + 3, + 2 + ], + "lineDashEnding" : "NoConstraint", + "controlPointEnding" : "NoConstraint" } ], "enable" : true, @@ -1233,9 +1234,9 @@ "color" : { "type" : "CIMRGBColor", "values" : [ - 163, - 242, - 242, + 115, + 223, + 255, 100 ] } @@ -1717,13 +1718,6 @@ "snappable" : true } ], - "binaryReferences" : [ - { - "type" : "CIMBinaryReference", - "uRI" : "CIMPATH=Metadata/c25c8f0b5a27383511ea9cb899f46b64.xml", - "data" : "\r\n20240716204124001.0TRUENHDFlowline\r\n" - } - ], "rGBColorProfile" : "sRGB IEC61966-2.1", "cMYKColorProfile" : "U.S. Web Coated (SWOP) v2", "elevationSurfaceLayerDefinitions" : [ diff --git a/Symbology/arcpro/Shared/railroads.lyrx b/Symbology/arcpro/Shared/railroads.lyrx index e70ec1d4..1789037d 100644 --- a/Symbology/arcpro/Shared/railroads.lyrx +++ b/Symbology/arcpro/Shared/railroads.lyrx @@ -8,7 +8,7 @@ "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "railways", + "name" : "Rail", "uRI" : "CIMPATH=map/railways.json", "sourceModifiedTime" : { "type" : "TimeInstant" @@ -221,7 +221,7 @@ }, "dataConnection" : { "type" : "CIMStandardDataConnection", - "workspaceConnectionString" : "DATABASE=..\\..\\..\\..\\1711000104_sumas\\Riverscapes_Context_Sumas\\transportation", + "workspaceConnectionString" : "DATABASE=..\\..\\..\\1602020402_bigcottonwood\\Riverscapes_Context_BigCottonwood\\transportation", "workspaceFactory" : "Shapefile", "dataset" : "railways.shp", "datasetType" : "esriDTFeatureClass" @@ -494,7 +494,7 @@ "endings" : "NoConstraint", "offsetAlongLine" : 7.5, "placementTemplate" : [ - 15 + 8 ] }, "frame" : { diff --git a/Symbology/arcpro/Shared/roads.lyrx b/Symbology/arcpro/Shared/roads.lyrx index 7a2429f9..a1db069a 100644 --- a/Symbology/arcpro/Shared/roads.lyrx +++ b/Symbology/arcpro/Shared/roads.lyrx @@ -3,29 +3,24 @@ "version" : "3.3.0", "build" : 52636, "layers" : [ - "CIMPATH=map/usgs_symbology2.json" + "CIMPATH=map/roads.json" ], "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "USGS Symbology", - "uRI" : "CIMPATH=map/usgs_symbology2.json", + "name" : "Roads", + "uRI" : "CIMPATH=map/roads.json", "sourceModifiedTime" : { "type" : "TimeInstant" }, - "metadataURI" : "CIMPATH=Metadata/866c3bc11db1d11325e5baa002659efd.xml", - "useSourceMetadata" : false, - "description" : ".", + "useSourceMetadata" : true, + "description" : "roads", "layerElevation" : { "type" : "CIMLayerElevationSurface", "elevationSurfaceLayerURI" : "CIMPATH=Map/7d7072e6416e464682803d99a9d3d585.json" }, "expanded" : true, "layerType" : "Operational", - "layerScaleVisibilityOptions" : { - "type" : "CIMLayerScaleVisibilityOptions", - "showLayerAtAllScales" : true - }, "showLegends" : true, "visibility" : true, "displayCacheType" : "Permanent", @@ -40,8 +35,235 @@ "featureElevationExpression" : "0", "featureTable" : { "type" : "CIMFeatureTable", - "displayField" : "PERMANENT_", + "displayField" : "name", "editable" : true, + "fieldDescriptions" : [ + { + "type" : "CIMFieldDescription", + "alias" : "FID", + "fieldName" : "FID", + "numberFormat" : { + "type" : "CIMNumericFormat", + "alignmentOption" : "esriAlignRight", + "alignmentWidth" : 0, + "roundingOption" : "esriRoundNumberOfDecimals", + "roundingValue" : 0 + }, + "readOnly" : true, + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "Shape", + "fieldName" : "Shape", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "permanent_", + "fieldName" : "permanent_", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "source_fea", + "fieldName" : "source_fea", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "source_dat", + "fieldName" : "source_dat", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "source_d_1", + "fieldName" : "source_d_1", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "source_ori", + "fieldName" : "source_ori", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "loaddate", + "fieldName" : "loaddate", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "interstate", + "fieldName" : "interstate", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "us_route", + "fieldName" : "us_route", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "state_rout", + "fieldName" : "state_rout", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "county_rou", + "fieldName" : "county_rou", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "federal_la", + "fieldName" : "federal_la", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "stco_fipsc", + "fieldName" : "stco_fipsc", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "tnmfrc", + "fieldName" : "tnmfrc", + "numberFormat" : { + "type" : "CIMNumericFormat", + "alignmentOption" : "esriAlignRight", + "alignmentWidth" : 0, + "roundingOption" : "esriRoundNumberOfDecimals", + "roundingValue" : 0 + }, + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "name", + "fieldName" : "name", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "mtfcc_code", + "fieldName" : "mtfcc_code", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "intersta_1", + "fieldName" : "intersta_1", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "intersta_2", + "fieldName" : "intersta_2", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "intersta_3", + "fieldName" : "intersta_3", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "us_route_a", + "fieldName" : "us_route_a", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "us_route_b", + "fieldName" : "us_route_b", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "us_route_c", + "fieldName" : "us_route_c", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "state_ro_1", + "fieldName" : "state_ro_1", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "state_ro_2", + "fieldName" : "state_ro_2", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "state_ro_3", + "fieldName" : "state_ro_3", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "SHAPE_Leng", + "fieldName" : "SHAPE_Leng", + "numberFormat" : { + "type" : "CIMNumericFormat", + "alignmentOption" : "esriAlignRight", + "alignmentWidth" : 0, + "roundingOption" : "esriRoundNumberOfDecimals", + "roundingValue" : 6 + }, + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "ObjectID", + "fieldName" : "ObjectID", + "numberFormat" : { + "type" : "CIMNumericFormat", + "alignmentOption" : "esriAlignRight", + "alignmentWidth" : 0, + "roundingOption" : "esriRoundNumberOfDecimals", + "roundingValue" : 0 + }, + "visible" : true, + "searchMode" : "Exact" + } + ], "timeFields" : { "type" : "CIMTimeTableDefinition" }, @@ -56,308 +278,11 @@ "timeOffsetUnits" : "esriTimeUnitsYears" }, "dataConnection" : { - "type" : "CIMSqlQueryDataConnection", - "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\..\\1701020301_landers\\Anthro_Landers\\inputs\\inputs.gpkg", - "workspaceFactory" : "Sql", - "dataset" : "main.%roads", - "datasetType" : "esriDTFeatureClass", - "sqlQuery" : "select fid,geom,permanent_,source_fea,source_dat,source_d_1,source_ori,loaddate,interstate,us_route,state_rout,county_rou,federal_la,stco_fipsc,tnmfrc,name,mtfcc_code,intersta_1,intersta_2,intersta_3,us_route_a,us_route_b,us_route_c,state_ro_1,state_ro_2,state_ro_3,SHAPE_Leng,ObjectID from main.roads", - "srid" : "4326", - "spatialReference" : { - "wkid" : 4326, - "latestWkid" : 4326, - "xyTolerance" : 8.983152841195215e-09, - "zTolerance" : 0.001, - "mTolerance" : 0.001, - "falseX" : -400, - "falseY" : -400, - "xyUnits" : 999999999.99999988, - "falseZ" : -100000, - "zUnits" : 10000, - "falseM" : -100000, - "mUnits" : 10000 - }, - "oIDFields" : "fid", - "geometryType" : "esriGeometryPolyline", - "queryFields" : [ - { - "name" : "fid", - "type" : "esriFieldTypeBigInteger", - "isNullable" : false, - "length" : 8, - "precision" : 0, - "scale" : 0, - "required" : true, - "editable" : false, - "dbmsType" : 11 - }, - { - "name" : "geom", - "type" : "esriFieldTypeGeometry", - "isNullable" : true, - "length" : 8, - "precision" : 0, - "scale" : 0, - "geometryDef" : { - "avgNumPoints" : 0, - "geometryType" : "esriGeometryPolyline", - "hasM" : false, - "hasZ" : false, - "spatialReference" : { - "wkid" : 4326, - "latestWkid" : 4326, - "xyTolerance" : 8.983152841195215e-09, - "zTolerance" : 0.001, - "mTolerance" : 0.001, - "falseX" : -400, - "falseY" : -400, - "xyUnits" : 999999999.99999988, - "falseZ" : -100000, - "zUnits" : 10000, - "falseM" : -100000, - "mUnits" : 10000 - } - }, - "dbmsType" : 8 - }, - { - "name" : "permanent_", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 40, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "source_fea", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 40, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "source_dat", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 40, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "source_d_1", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 100, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "source_ori", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 130, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "loaddate", - "type" : "esriFieldTypeDateOnly", - "isNullable" : true, - "length" : 8, - "precision" : 0, - "scale" : 0, - "dbmsType" : 7 - }, - { - "name" : "interstate", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "us_route", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "state_rout", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "county_rou", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "federal_la", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "stco_fipsc", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 5, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "tnmfrc", - "type" : "esriFieldTypeInteger", - "isNullable" : true, - "length" : 4, - "precision" : 0, - "scale" : 0, - "dbmsType" : 2 - }, - { - "name" : "name", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 100, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "mtfcc_code", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 50, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "intersta_1", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "intersta_2", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "intersta_3", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "us_route_a", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "us_route_b", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "us_route_c", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "state_ro_1", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "state_ro_2", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "state_ro_3", - "type" : "esriFieldTypeString", - "isNullable" : true, - "length" : 25, - "precision" : 0, - "scale" : 0, - "dbmsType" : 5 - }, - { - "name" : "SHAPE_Leng", - "type" : "esriFieldTypeDouble", - "isNullable" : true, - "length" : 8, - "precision" : 0, - "scale" : 0, - "dbmsType" : 4 - }, - { - "name" : "ObjectID", - "type" : "esriFieldTypeInteger", - "isNullable" : true, - "length" : 4, - "precision" : 0, - "scale" : 0, - "dbmsType" : 2 - } - ], - "spatialStorageType" : 11, - "isTableBased" : true, - "mappedOIDFieldLength" : "OID64Bit" + "type" : "CIMStandardDataConnection", + "workspaceConnectionString" : "DATABASE=..\\..\\..\\1602020402_bigcottonwood\\Riverscapes_Context_BigCottonwood\\transportation", + "workspaceFactory" : "Shapefile", + "dataset" : "roads.shp", + "datasetType" : "esriDTFeatureClass" }, "studyAreaSpatialRel" : "esriSpatialRelUndefined", "searchOrder" : "esriSearchOrderSpatial" @@ -370,36 +295,7 @@ }, "isFlattened" : true, "selectable" : true, - "selectionSymbol" : { - "type" : "CIMSymbolReference", - "symbol" : { - "type" : "CIMLineSymbol", - "symbolLayers" : [ - { - "type" : "CIMSolidStroke", - "enable" : true, - "name" : "Level_0", - "capStyle" : "Round", - "joinStyle" : "Round", - "lineStyle3D" : "Strip", - "miterLimit" : 10, - "width" : 2, - "height3D" : 1, - "anchor3D" : "Center", - "color" : { - "type" : "CIMRGBColor", - "values" : [ - 0, - 255, - 255, - 100 - ] - } - } - ] - } - }, - "featureCacheType" : "None", + "featureCacheType" : "Session", "displayFiltersType" : "ByScale", "featureBlendingMode" : "Alpha", "layerEffectsMode" : "Layer", @@ -418,18 +314,19 @@ "canRemoveOverlappingLabel" : true, "canStackLabel" : true, "centerLabelAnchorType" : "Symbol", - "connectionType" : "Unambiguous", - "constrainOffset" : "NoConstraint", + "connectionType" : "MinimizeLabels", + "constrainOffset" : "AboveLine", "contourAlignmentType" : "Page", "contourLadderType" : "Straight", "contourMaximumAngle" : 90, "enableConnection" : true, - "featureWeight" : 100, + "featureWeight" : 0, "fontHeightReductionLimit" : 4, "fontHeightReductionStep" : 0.5, "fontWidthReductionLimit" : 90, "fontWidthReductionStep" : 5, "graticuleAlignmentType" : "Straight", + "keyNumberGroupName" : "Default", "labelBuffer" : 15, "labelLargestPolygon" : true, "labelPriority" : -1, @@ -439,19 +336,33 @@ "maximumNumberOfLines" : 3, "minimumNumberOfCharsPerLine" : 3, "maximumNumberOfCharsPerLine" : 24, + "separators" : [ + { + "type" : "CIMMaplexStackingSeparator", + "separator" : " ", + "splitAfter" : true + }, + { + "type" : "CIMMaplexStackingSeparator", + "separator" : ",", + "visible" : true, + "splitAfter" : true + } + ], "trimStackingSeparators" : true }, "lineFeatureType" : "General", - "linePlacementMethod" : "OffsetCurvedFromLine", - "maximumLabelOverrun" : 36, + "linePlacementMethod" : "OffsetStraightFromLine", + "maximumLabelOverrun" : 16, "maximumLabelOverrunUnit" : "Point", + "measureFromClippedFeatureGeometry" : true, "minimumFeatureSizeUnit" : "Map", - "multiPartOption" : "OneLabelPerPart", + "multiPartOption" : "OneLabelPerFeature", "offsetAlongLineProperties" : { "type" : "CIMMaplexOffsetAlongLineProperties", "placementMethod" : "BestPositionAlongLine", "labelAnchorPoint" : "CenterOfLabel", - "distanceUnit" : "Percentage", + "distanceUnit" : "Map", "useLineDirection" : true }, "pointExternalZonePriorities" : { @@ -467,7 +378,7 @@ }, "pointPlacementMethod" : "AroundPoint", "polygonAnchorPointType" : "GeometricCenter", - "polygonBoundaryWeight" : 200, + "polygonBoundaryWeight" : 0, "polygonExternalZones" : { "type" : "CIMMaplexExternalZonePriorities", "aboveLeft" : 4, @@ -489,7 +400,7 @@ "primaryOffsetUnit" : "Point", "removeAmbiguousLabels" : "All", "removeExtraWhiteSpace" : true, - "repetitionIntervalUnit" : "Map", + "repetitionIntervalUnit" : "Point", "rotationProperties" : { "type" : "CIMMaplexRotationProperties", "rotationType" : "Arithmetic", @@ -505,10 +416,11 @@ "fontReduction" : 4, "abbreviation" : 5 }, - "thinningDistanceUnit" : "Map", + "thinningDistanceUnit" : "Point", "truncationMarkerCharacter" : ".", "truncationMinimumLength" : 1, "truncationPreferredCharacters" : "aeiou", + "truncationExcludedCharacters" : "0123456789", "polygonAnchorPointPerimeterInsetUnit" : "Point" }, "name" : "Default", @@ -665,7 +577,7 @@ }, "defaultSymbolPatch" : "Default", "fields" : [ - "TNMFRC" + "tnmfrc" ], "groups" : [ { @@ -946,8 +858,8 @@ { "type" : "CIMGeometricEffectDashes", "dashTemplate" : [ - 3.6000000000000001, - 1.6000000000000001 + 8.3333333333333339, + 3.7037037037037042 ], "lineDashEnding" : "NoConstraint", "controlPointEnding" : "NoConstraint" @@ -955,7 +867,7 @@ { "type" : "CIMGeometricEffectOffset", "method" : "Mitered", - "offset" : 0.69840000000000002, + "offset" : 1.6166666666666667, "option" : "Fast" } ], @@ -965,7 +877,7 @@ "joinStyle" : "Miter", "lineStyle3D" : "Strip", "miterLimit" : 10, - "width" : 0.216, + "width" : 0.5, "height3D" : 1, "anchor3D" : "Center", "color" : { @@ -984,8 +896,8 @@ { "type" : "CIMGeometricEffectDashes", "dashTemplate" : [ - 3.6000000000000001, - 1.6000000000000001 + 8.3333333333333339, + 3.7037037037037042 ], "lineDashEnding" : "NoConstraint", "controlPointEnding" : "NoConstraint" @@ -993,7 +905,7 @@ { "type" : "CIMGeometricEffectOffset", "method" : "Mitered", - "offset" : -0.69840000000000002, + "offset" : -1.6166666666666667, "option" : "Fast" } ], @@ -1004,7 +916,7 @@ "joinStyle" : "Miter", "lineStyle3D" : "Strip", "miterLimit" : 10, - "width" : 0.216, + "width" : 0.5, "height3D" : 1, "anchor3D" : "Center", "color" : { @@ -1316,13 +1228,6 @@ } } ], - "binaryReferences" : [ - { - "type" : "CIMBinaryReference", - "uRI" : "CIMPATH=Metadata/866c3bc11db1d11325e5baa002659efd.xml", - "data" : "\r\n20240720214752001.0TRUEUSGS Symbology.\r\n" - } - ], "rGBColorProfile" : "sRGB IEC61966-2.1", "cMYKColorProfile" : "U.S. Web Coated (SWOP) v2", "elevationSurfaceLayerDefinitions" : [ diff --git a/Symbology/qgis/RSContext/geo.qml b/Symbology/qgis/RSContext/geo.qml index e81e76f3..9d5cc16e 100644 --- a/Symbology/qgis/RSContext/geo.qml +++ b/Symbology/qgis/RSContext/geo.qml @@ -1,1173 +1,1173 @@ - + 1 1 1 0 - + - + - + - - - + - - - + - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - - + - - + + + + + + + + + + + + + + + + - + - - - - + + + + - + - + - + - + - - - + + + - - + @@ -1311,7 +1347,7 @@ - @@ -1319,54 +1355,54 @@ 0 0 0.6 - - - - + + + + - + - + @@ -1374,294 +1410,294 @@ - + - + - + - - - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1787,38 +1852,38 @@ - + - + - @@ -1939,6 +2004,6 @@ def my_form_open(dialog, layer, feature): "UNIT_NAME" - + 2 diff --git a/Symbology/qgis/Shared/canals_ditches.qml b/Symbology/qgis/Shared/canals_ditches.qml index 390c7073..365e90e6 100644 --- a/Symbology/qgis/Shared/canals_ditches.qml +++ b/Symbology/qgis/Shared/canals_ditches.qml @@ -1,147 +1,312 @@ - + 1 1 1 + 0 - + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - + 0 0 1 - - + + + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + @@ -149,23 +314,23 @@ - + - + - + - + - + + + + - + - + - + - + - @@ -224,14 +392,17 @@ def my_form_open(dialog, layer, feature): 0 generatedlayout - + - + + + + "FID" - + 1 diff --git a/Symbology/qgis/Shared/flow_lines.qml b/Symbology/qgis/Shared/flow_lines.qml index 82f68754..5d4a392b 100644 --- a/Symbology/qgis/Shared/flow_lines.qml +++ b/Symbology/qgis/Shared/flow_lines.qml @@ -1,33 +1,165 @@ - + 1 1 1 0 - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + diff --git a/Symbology/qgis/Shared/railroads.qml b/Symbology/qgis/Shared/railroads.qml index 5995c1f8..87bed0f7 100644 --- a/Symbology/qgis/Shared/railroads.qml +++ b/Symbology/qgis/Shared/railroads.qml @@ -1,186 +1,258 @@ - + 1 1 1 0 - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - @@ -191,9 +263,61 @@ + + + + + + + + + + + + + + + + @@ -201,80 +325,54 @@ 0 0 1 - - - + + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -282,136 +380,129 @@ - + - + - + - + - + - + - + - + - - + + - + - + - - - - - - - + - - + + - + - + - + - + - + - - + + @@ -419,105 +510,118 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - + - + - @@ -557,57 +661,105 @@ def my_form_open(dialog, layer, feature): + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - "Name" - + "name" + 1 diff --git a/Symbology/web/RSContext/fair_market.txt b/Symbology/web/RSContext/fair_market.txt new file mode 100644 index 00000000..55a87030 --- /dev/null +++ b/Symbology/web/RSContext/fair_market.txt @@ -0,0 +1,13 @@ +# QGIS Generated Color Map Export File +INTERPOLATION:DISCRETE +1000,0,97,0,255,< $1,000 +5000,51,129,0,255,$1,000 to $5,000 +10000,102,160,0,255,$5,000 to $10,000 +25000,153,192,0,255,$10,000 to $25,000 +50000,204,224,0,255,$25,000 to $50,000 +100000,255,255,0,255,$50,000 to $100,000 +200000,255,211,0,255,$100,000 to $200,000 +250000,255,167,0,255,$200,000 to $250,000 +500000,255,122,0,255,$250,000 to $500,000 +1000000,255,78,0,255,$500,000 to $1,000,000 +inf,255,34,0,255,> $1,000,000 diff --git a/Symbology/web/RSContext/wbdhu10.json b/Symbology/web/RSContext/wbdhu10.json index 04bc89f5..a839ab89 100644 --- a/Symbology/web/RSContext/wbdhu10.json +++ b/Symbology/web/RSContext/wbdhu10.json @@ -17,7 +17,7 @@ "type": "symbol", "source": "composite", "source-layer": "HUC10-dl27bp", - "layout": {"text-field": ["to-string", ["get", "HUC10"]]}, + "layout": {"text-field": ["to-string", ["get", "huc10"]], "text-size": 14}, "paint": {} } ] diff --git a/Symbology/web/RSContext/wbdhu12.json b/Symbology/web/RSContext/wbdhu12.json index 5b998a89..6df6b9ca 100644 --- a/Symbology/web/RSContext/wbdhu12.json +++ b/Symbology/web/RSContext/wbdhu12.json @@ -17,7 +17,7 @@ "type": "symbol", "source": "composite", "source-layer": "HUC12-b4e9en", - "layout": {"text-field": ["to-string", ["get", "HUC12"]]}, + "layout": {"text-field": ["to-string", ["get", "huc12"]], "text-size": 10}, "paint": {} } ] diff --git a/Symbology/web/RSContext/wbdhu2.json b/Symbology/web/RSContext/wbdhu2.json index 24addc3b..2adc160f 100644 --- a/Symbology/web/RSContext/wbdhu2.json +++ b/Symbology/web/RSContext/wbdhu2.json @@ -17,7 +17,7 @@ "type": "symbol", "source": "composite", "source-layer": "HUC2-3hc6dg", - "layout": {"text-field": ["to-string", ["get", "HUC2"]]}, + "layout": {"text-field": ["to-string", ["get", "huc2"]], "text-size": 20}, "paint": {} } ] diff --git a/Symbology/web/RSContext/wbdhu4.json b/Symbology/web/RSContext/wbdhu4.json index 85b0a79f..30fc55da 100644 --- a/Symbology/web/RSContext/wbdhu4.json +++ b/Symbology/web/RSContext/wbdhu4.json @@ -17,7 +17,7 @@ "type": "symbol", "source": "composite", "source-layer": "HUC4-3z13nu", - "layout": {"text-field": ["to-string", ["get", "HUC4"]]}, + "layout": {"text-field": ["to-string", ["get", "huc4"]], "text-size": 20}, "paint": {} } ] diff --git a/Symbology/web/RSContext/wbdhu6.json b/Symbology/web/RSContext/wbdhu6.json index a7280cc6..b035497f 100644 --- a/Symbology/web/RSContext/wbdhu6.json +++ b/Symbology/web/RSContext/wbdhu6.json @@ -17,7 +17,7 @@ "type": "symbol", "source": "composite", "source-layer": "HUC6-2hkkdg", - "layout": {"text-field": ["to-string", ["get", "HUC6"]]}, + "layout": {"text-field": ["to-string", ["get", "huc6"]], "text-size": 20}, "paint": {} } ] diff --git a/Symbology/web/RSContext/wbdhu8.json b/Symbology/web/RSContext/wbdhu8.json index c222a4d6..caa07e66 100644 --- a/Symbology/web/RSContext/wbdhu8.json +++ b/Symbology/web/RSContext/wbdhu8.json @@ -17,7 +17,7 @@ "type": "symbol", "source": "composite", "source-layer": "HUC-9rykv6", - "layout": {"text-field": ["to-string", ["get", "HUC8"]]}, + "layout": {"text-field": ["to-string", ["get", "huc8"]], "text-size": 16}, "paint": {} } ] diff --git a/Symbology/web/Shared/canals_ditches.json b/Symbology/web/Shared/canals_ditches.json index bbd585f3..17095c39 100644 --- a/Symbology/web/Shared/canals_ditches.json +++ b/Symbology/web/Shared/canals_ditches.json @@ -1,16 +1,19 @@ { - "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json", + "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json", "legend": [ - ["hsl(180, 76%, 79%)", "Canals and Ditches"] + ["rgb(115, 223, 255)", "Canals and Ditches"] ], "layerStyles": [ { - "id": "canals-ditches-7tezx4", - "type": "line", - "source": "composite", - "source-layer": "Canals_Ditches-7tezx4", - "layout": {}, - "paint": {"line-color": "hsl(180, 76%, 79%)"} - } - ] + "id": "canals-ditches-98wueu", + "type": "line", + "source": "composite", + "source-layer": "canals_ditches-98wueu", + "layout": {}, + "paint": { + "line-dasharray": [3, 2], + "line-color": "rgb(115, 223, 255)" + } + } +] } \ No newline at end of file diff --git a/Symbology/web/Shared/flow_lines.json b/Symbology/web/Shared/flow_lines.json index 5a8e6358..cf5c6d85 100644 --- a/Symbology/web/Shared/flow_lines.json +++ b/Symbology/web/Shared/flow_lines.json @@ -2,7 +2,7 @@ "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json", "legend": [ ["hsl(213, 100%, 33%)", "46006 - Perennial"], - ["hsl(180, 75%, 79%)", "33600 - Canal"], + ["hsl(194, 100%, 72.55%)", "33600 - Canal"], ["hsl(40, 100%, 50%)", "33400 - Connector"], ["hsl(351, 55%, 58%)", "55800 - Artificial Path"], ["hsl(80, 100%, 50%)", "46003 - Intermittent (dashed)"], @@ -19,11 +19,9 @@ "paint": { "line-color": [ "match", - ["get", "fcode"], + ["get", "FCode"], [46006], "hsl(213, 100%, 33%)", - [33600], - "hsl(180, 75%, 79%)", [33400], "hsl(40, 100%, 50%)", [55800], @@ -41,11 +39,13 @@ "paint": { "line-color": [ "match", - ["get", "fcode"], + ["get", "FCode"], [46003], "hsl(80, 100%, 50%)", [46007], "hsl(40, 100%, 45%)", + [33600], + "hsl(194, 100%, 72.55%)", "hsla(0, 0%, 0%, 0)" ], "line-dasharray": [1, 2] @@ -61,7 +61,7 @@ "line-dasharray": [2, 2], "line-color": [ "match", - ["get", "fcode"], + ["get", "FCode"], [42800, 42801, 42802, 42807, 42813], "#000000", "hsla(0, 0%, 0%, 0)" @@ -78,7 +78,7 @@ "paint": { "line-color": [ "match", - ["get", "fcode"], + ["get", "FCode"], [42800, 42801, 42802, 42807, 42813], "#000000", "hsla(0, 0%, 0%, 0)" @@ -86,83 +86,6 @@ "line-width": 2, "line-gap-width": 2 } - }, - { - "id": "Full NHD HR - solid", - "type": "line", - "source": "composite", - "source-layer": "NHD_flowline-6tver9", - "layout": {}, - "paint": { - "line-color": [ - "match", - ["get", "FCode"], - [46006], - "hsl(213, 100%, 33%)", - [33600], - "hsl(180, 75%, 79%)", - [33400], - "hsl(40, 100%, 50%)", - [55800], - "hsl(351, 55%, 58%)", - "hsla(0, 0%, 0%, 0)" - ] - } -}, -{ - "id": "Full NHD HR - dashed", - "type": "line", - "source": "composite", - "source-layer": "NHD_flowline-6tver9", - "layout": {}, - "paint": { - "line-color": [ - "match", - ["get", "FCode"], - [46003], - "hsl(80, 100%, 50%)", - [46007], - "hsl(40, 100%, 45%)", - "hsla(0, 0%, 0%, 0)" - ], - "line-dasharray": [1, 2] - } -}, -{ - "id": "Full NHD HR - pipes", - "type": "line", - "source": "composite", - "source-layer": "NHD_flowline-6tver9", - "layout": {}, - "paint": { - "line-dasharray": [2, 2], - "line-color": [ - "match", - ["get", "FCode"], - [42800, 42801, 42802, 42807, 42813], - "#000000", - "hsla(0, 0%, 0%, 0)" - ], - "line-width": 2 - } -}, -{ - "id": "Full NHD HR - pipes gap", - "type": "line", - "source": "composite", - "source-layer": "NHD_flowline-6tver9", - "layout": {}, - "paint": { - "line-color": [ - "match", - ["get", "FCode"], - [42800, 42801, 42802, 42807, 42813], - "#000000", - "hsla(0, 0%, 0%, 0)" - ], - "line-width": 2, - "line-gap-width": 2 - } -} + } ] } \ No newline at end of file diff --git a/Symbology/web/Shared/railroads.json b/Symbology/web/Shared/railroads.json index 43fdb71a..4c150dc9 100644 --- a/Symbology/web/Shared/railroads.json +++ b/Symbology/web/Shared/railroads.json @@ -11,9 +11,9 @@ "source-layer": "Rail-6j6x9c", "layout": {}, "paint": { - "line-dasharray": [2, 4], - "line-gap-width": 3, - "line-width": 3 + "line-dasharray": [0.25, 3], + "line-gap-width": 1.5, + "line-width": 2 } }, { diff --git a/Symbology/web/Shared/roads.json b/Symbology/web/Shared/roads.json index 45c9a462..fe86f9e1 100644 --- a/Symbology/web/Shared/roads.json +++ b/Symbology/web/Shared/roads.json @@ -6,7 +6,7 @@ ["hsl(120, 0%, 43%)", "Local Connector"], ["hsl(0, 0%, 61%)", "Local Road"], ["hsl(0, 48%, 60%)", "Ramp"], - ["hsla(0, 0%, 0%, 0)", "4WD (dashed)"] + ["hsla(0, 0%, 40.78%, 0)", "4WD (dashed)"] ], "layerStyles": [ { @@ -20,7 +20,7 @@ "match", ["get", "tnmfrc"], [6], - "#000000", + "hsla(0, 0%, 40.78%, 0)", "hsla(0, 0%, 0%, 0)" ], "line-gap-width": ["match", ["get", "tnmfrc"], [6], 2, 0], diff --git a/Symbology/web/Shared/upstreamdrainagearea.json b/Symbology/web/Shared/upstreamdrainagearea.json index c92bd051..aff19c15 100644 --- a/Symbology/web/Shared/upstreamdrainagearea.json +++ b/Symbology/web/Shared/upstreamdrainagearea.json @@ -1,49 +1,72 @@ { - "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json", + "$schema": "https://xml.riverscapes.xyz/Symbology/web/vector.schema.json", "legend": [ - ["hsl(201, 100%, 87%)", "0 - 15"], - ["hsl(200, 62%, 71%)", "15 - 50"], - ["hsl(200, 49%, 57%)", "50 - 100"], - ["hsl(200, 54%, 44%)", "100 - 250"], - ["hsl(200, 74%, 32%)", "250 - 500"], - ["hsl(200, 100%, 23%)", ">500"] + ["rgb(191, 233, 255)", "0 - 15 sq. km"], + ["rgb(136, 197, 227)", "15 - 50 sq. km"], + ["rgb(90, 162, 199)", "50 - 100 sq. km"], + ["rgb(51, 131, 171)", "100 - 250 sq. km"], + ["rgb(21, 102, 143)", "250 - 500 sq. km"], + ["rgb(0, 76, 115)", "> 500 sq. km"] ], "layerStyles": [ { - "id": "Network - Upstream Drainage Area - sq.km", - "type": "line", - "source": "composite", - "source-layer": "NHD_flowline-6tver9", - "layout": {}, - "paint": { - "line-color": [ - "step", - ["get", "TotDASqKm"], - "hsl(201, 100%, 87%)", - 15, - "hsl(201, 100%, 87%)", - 15.000001, - "hsl(200, 62%, 71%)", - 50, - "hsl(200, 62%, 71%)", - 50.000001, - "hsl(200, 49%, 57%)", - 100, - "hsl(200, 49%, 57%)", - 100.00001, - "hsl(200, 54%, 44%)", - 250, - "hsl(200, 54%, 44%)", - 250.000001, - "hsl(200, 74%, 32%)", - 500, - "hsl(200, 74%, 32%)", - 500.000001, - "hsl(200, 100%, 23%)", - 3604, - "hsl(200, 100%, 23%)" - ] - } - } - ] + "id": "upstreamdrainagearea-2hi4ge", + "type": "line", + "source": "composite", + "source-layer": "upstreamdrainagearea-2hi4ge", + "layout": {}, + "paint": { + "line-color": [ + "interpolate", + ["linear"], + ["get", "TotDASqKm"], + 0.00, + "rgb(191, 233, 255)", + 15, + "rgb(191, 233, 255)", + 15.0001, + "rgb(136, 197, 227)", + 50, + "rgb(136, 197, 227)", + 50.0001, + "rgb(90, 162, 199)", + 100, + "rgb(90, 162, 199)", + 100.0001, + "rgb(51, 131, 171)", + 250, + "rgb(51, 131, 171)", + 250.0001, + "rgb(21, 102, 143)", + 500, + "rgb(21, 102, 143)", + 500.0001, + "rgb(0, 76, 115)", + 1000000, + "rgb(0, 76, 115)" + ], + "line-width": [ + "interpolate", + ["linear"], + ["get", "TotDASqKm"], + 0.00, + 0.93, + 15, + 0.93, + 15.0001, + 1.33, + 250, + 1.33, + 250.0001, + 1.67, + 500, + 1.67, + 500.0001, + 2.67, + 1000000, + 2.67 + ] + } + } +] } \ No newline at end of file