From 1cddc1bbdaf2140c2af99f0137f81dda6eb8c7ab Mon Sep 17 00:00:00 2001 From: Chloe Seeborg Date: Fri, 24 Jan 2025 12:52:00 -0700 Subject: [PATCH] VBET curation updates not included in #779 --- Symbology/arcpro/Shared/CL_vb.lyrx | 69 ++- Symbology/arcpro/Shared/IGO.lyrx | 55 +- .../arcpro/Shared/vbet_extent_hollow.lyrx | 69 +-- Symbology/qgis/Shared/CL_vb.qml | 533 ++++++++---------- Symbology/web/Shared/CL_vb.json | 2 +- Symbology/web/Shared/DGO.json | 2 +- Symbology/web/Shared/IGO.json | 2 +- Symbology/web/Shared/vbet_extent_hollow.json | 2 +- 8 files changed, 315 insertions(+), 419 deletions(-) diff --git a/Symbology/arcpro/Shared/CL_vb.lyrx b/Symbology/arcpro/Shared/CL_vb.lyrx index fcc3ef87..e61997f2 100644 --- a/Symbology/arcpro/Shared/CL_vb.lyrx +++ b/Symbology/arcpro/Shared/CL_vb.lyrx @@ -3,18 +3,18 @@ "version" : "3.3.0", "build" : 52636, "layers" : [ - "CIMPATH=map/main_vbet_centerlines.json" + "CIMPATH=map/centerline_of_valley_bottom.json" ], "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "main.vbet_centerlines", - "uRI" : "CIMPATH=map/main_vbet_centerlines.json", + "name" : "Centerline of Valley Bottom", + "uRI" : "CIMPATH=map/centerline_of_valley_bottom.json", "sourceModifiedTime" : { "type" : "TimeInstant" }, "useSourceMetadata" : true, - "description" : "main.vbet_centerlines", + "description" : "Centerline of Valley Bottom", "layerElevation" : { "type" : "CIMLayerElevationSurface", "elevationSurfaceLayerURI" : "CIMPATH=Map/7d7072e6416e464682803d99a9d3d585.json" @@ -37,9 +37,40 @@ "type" : "CIMFeatureTable", "displayField" : "level_path", "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" : "geom", + "fieldName" : "geom", + "visible" : true, + "searchMode" : "Exact" + }, + { + "type" : "CIMFieldDescription", + "alias" : "level_path", + "fieldName" : "level_path", + "visible" : true, + "searchMode" : "Exact" + } + ], "dataConnection" : { "type" : "CIMSqlQueryDataConnection", - "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\1701020301_landers\\VBET_Landers\\outputs\\vbet.gpkg", + "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\1601010102_sulphur\\VBET_Sulphur\\outputs\\vbet.gpkg", "workspaceFactory" : "Sql", "dataset" : "main.%vbet_centerlines", "datasetType" : "esriDTFeatureClass", @@ -61,26 +92,6 @@ }, "oIDFields" : "fid", "geometryType" : "esriGeometryPolyline", - "extent" : { - "xmin" : -112.76962999999995, - "ymin" : 46.9656640000000607, - "xmax" : -112.506614999999954, - "ymax" : 47.2349890000000414, - "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 - } - }, "queryFields" : [ { "name" : "fid", @@ -378,12 +389,8 @@ { "type" : "CIMGeometricEffectDashes", "dashTemplate" : [ - 8, - 4, - 4, - 4, - 4, - 4 + 2, + 2 ], "lineDashEnding" : "NoConstraint", "controlPointEnding" : "NoConstraint" diff --git a/Symbology/arcpro/Shared/IGO.lyrx b/Symbology/arcpro/Shared/IGO.lyrx index 4469aabb..6bff51a5 100644 --- a/Symbology/arcpro/Shared/IGO.lyrx +++ b/Symbology/arcpro/Shared/IGO.lyrx @@ -3,18 +3,18 @@ "version" : "3.3.0", "build" : 52636, "layers" : [ - "CIMPATH=map/main_vbet_igos.json" + "CIMPATH=map/integrated_geographic_objects__igos_.json" ], "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "main.vbet_igos", - "uRI" : "CIMPATH=map/main_vbet_igos.json", + "name" : "Integrated Geographic Objects (IGOs)", + "uRI" : "CIMPATH=map/integrated_geographic_objects__igos_.json", "sourceModifiedTime" : { "type" : "TimeInstant" }, "useSourceMetadata" : true, - "description" : "main.vbet_igos", + "description" : "Integrated Geographic Objects (IGOs)", "layerElevation" : { "type" : "CIMLayerElevationSurface", "elevationSurfaceLayerURI" : "CIMPATH=Map/7d7072e6416e464682803d99a9d3d585.json" @@ -431,7 +431,7 @@ }, "dataConnection" : { "type" : "CIMSqlQueryDataConnection", - "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\..\\1701020301_landers\\VBET_Landers\\outputs\\vbet.gpkg", + "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\1601010102_sulphur\\VBET_Sulphur\\outputs\\vbet.gpkg", "workspaceFactory" : "Sql", "dataset" : "main.%vbet_igos", "datasetType" : "esriDTFeatureClass", @@ -453,26 +453,6 @@ }, "oIDFields" : "fid", "geometryType" : "esriGeometryPoint", - "extent" : { - "xmin" : -112.76911199999995, - "ymin" : 46.965733000000057, - "xmax" : -112.507125999999971, - "ymax" : 47.2348980000000438, - "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 - } - }, "queryFields" : [ { "name" : "fid", @@ -1012,7 +992,7 @@ "colorLocked" : true, "anchorPointUnits" : "Relative", "dominantSizeAxis3D" : "Y", - "size" : 6, + "size" : 3.5, "billboardMode3D" : "FaceNearPlane", "characterIndex" : 40, "fontFamilyName" : "ESRI Default Marker", @@ -1022,6 +1002,27 @@ "symbol" : { "type" : "CIMPolygonSymbol", "symbolLayers" : [ + { + "type" : "CIMSolidStroke", + "enable" : true, + "name" : "New_14b5cd41-c5b5-48bd-a862-17ba693a55ee", + "capStyle" : "Round", + "joinStyle" : "Round", + "lineStyle3D" : "Strip", + "miterLimit" : 4, + "width" : 0.40000000000000002, + "height3D" : 1, + "anchor3D" : "Center", + "color" : { + "type" : "CIMRGBColor", + "values" : [ + 0, + 0, + 0, + 100 + ] + } + }, { "type" : "CIMSolidFill", "enable" : true, @@ -1046,7 +1047,7 @@ "enable" : true, "anchorPointUnits" : "Relative", "dominantSizeAxis3D" : "Y", - "size" : 6, + "size" : 3.5, "billboardMode3D" : "FaceNearPlane", "characterIndex" : 33, "fontFamilyName" : "ESRI Default Marker", diff --git a/Symbology/arcpro/Shared/vbet_extent_hollow.lyrx b/Symbology/arcpro/Shared/vbet_extent_hollow.lyrx index 324293f3..762ef4f5 100644 --- a/Symbology/arcpro/Shared/vbet_extent_hollow.lyrx +++ b/Symbology/arcpro/Shared/vbet_extent_hollow.lyrx @@ -3,18 +3,18 @@ "version" : "3.3.0", "build" : 52636, "layers" : [ - "CIMPATH=map/main_vbet_full.json" + "CIMPATH=map/valley_bottom_extent__hollow_2.json" ], "layerDefinitions" : [ { "type" : "CIMFeatureLayer", - "name" : "main.vbet_full", - "uRI" : "CIMPATH=map/main_vbet_full.json", + "name" : "Valley Bottom Extent (Hollow)", + "uRI" : "CIMPATH=map/valley_bottom_extent__hollow_2.json", "sourceModifiedTime" : { "type" : "TimeInstant" }, "useSourceMetadata" : true, - "description" : "main.vbet_full", + "description" : "Valley Bottom Extent (Hollow)", "layerElevation" : { "type" : "CIMLayerElevationSurface", "elevationSurfaceLayerURI" : "CIMPATH=Map/7d7072e6416e464682803d99a9d3d585.json" @@ -96,7 +96,7 @@ }, "dataConnection" : { "type" : "CIMSqlQueryDataConnection", - "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\..\\1701020301_landers\\VBET_Landers\\outputs\\vbet.gpkg", + "workspaceConnectionString" : "AUTHENTICATION_MODE=OSA;DATABASE=..\\..\\..\\VBET_Pierpont_Lake\\outputs\\vbet.gpkg", "workspaceFactory" : "Sql", "dataset" : "main.%vbet_full", "datasetType" : "esriDTFeatureClass", @@ -118,26 +118,6 @@ }, "oIDFields" : "fid", "geometryType" : "esriGeometryPolygon", - "extent" : { - "xmin" : -112.769690999999966, - "ymin" : 46.9656180000000631, - "xmax" : -112.506568999999956, - "ymax" : 47.2350430000000756, - "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 - } - }, "queryFields" : [ { "name" : "fid", @@ -455,17 +435,6 @@ "symbolLayers" : [ { "type" : "CIMSolidStroke", - "effects" : [ - { - "type" : "CIMGeometricEffectDashes", - "dashTemplate" : [ - 2, - 2 - ], - "lineDashEnding" : "NoConstraint", - "controlPointEnding" : "NoConstraint" - } - ], "enable" : true, "capStyle" : "Butt", "joinStyle" : "Round", @@ -485,33 +454,15 @@ } }, { - "type" : "CIMSolidStroke", - "effects" : [ - { - "type" : "CIMGeometricEffectDashes", - "dashTemplate" : [ - 2, - 2 - ], - "lineDashEnding" : "NoConstraint", - "controlPointEnding" : "NoConstraint" - } - ], + "type" : "CIMSolidFill", "enable" : true, - "capStyle" : "Butt", - "joinStyle" : "Round", - "lineStyle3D" : "Strip", - "miterLimit" : 10, - "width" : 1.5, - "height3D" : 1, - "anchor3D" : "Center", "color" : { "type" : "CIMRGBColor", "values" : [ - 104, - 104, - 104, - 100 + 204, + 204, + 204, + 0 ] } } diff --git a/Symbology/qgis/Shared/CL_vb.qml b/Symbology/qgis/Shared/CL_vb.qml index 8369d0f6..524fc923 100644 --- a/Symbology/qgis/Shared/CL_vb.qml +++ b/Symbology/qgis/Shared/CL_vb.qml @@ -1,278 +1,194 @@ - + 1 1 1 0 - + - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - - - - - - - - - - - - + - + - - - - - - - - - - - - - - - - - - - - + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -281,9 +197,61 @@ + + + + + + + + + + + + + + + + @@ -292,79 +260,53 @@ 0 1 - - + + + - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -372,74 +314,66 @@ - + - + - + - + - - - - - - - - - + + + + + + - - + - - - + + - - - + + - + - + - @@ -474,20 +408,23 @@ def my_form_open(dialog, layer, feature): + - - - + + + + - - - + + + + "LevelPathI" - + 1 diff --git a/Symbology/web/Shared/CL_vb.json b/Symbology/web/Shared/CL_vb.json index 2df0eb6e..638085cb 100644 --- a/Symbology/web/Shared/CL_vb.json +++ b/Symbology/web/Shared/CL_vb.json @@ -10,7 +10,7 @@ "source": "composite", "source-layer": "vbet_centerlines-axpb18", "layout": {}, - "paint": {"line-dasharray": [15, 2, 5, 2]} + "paint": {"line-dasharray": [2, 2]} } ] } \ No newline at end of file diff --git a/Symbology/web/Shared/DGO.json b/Symbology/web/Shared/DGO.json index 883bd8e3..306a78df 100644 --- a/Symbology/web/Shared/DGO.json +++ b/Symbology/web/Shared/DGO.json @@ -10,7 +10,7 @@ "source": "composite", "source-layer": "DGO-ddzqcj", "layout": {}, - "paint": {"line-width": 2} + "paint": {"line-width": 1} } ] } \ No newline at end of file diff --git a/Symbology/web/Shared/IGO.json b/Symbology/web/Shared/IGO.json index 2dd52be9..b8352561 100644 --- a/Symbology/web/Shared/IGO.json +++ b/Symbology/web/Shared/IGO.json @@ -52,7 +52,7 @@ 5 ], "circle-color": "hsla(0, 0%, 0%, 0)", - "circle-stroke-width": 1 + "circle-stroke-width": 0.5 } } ] diff --git a/Symbology/web/Shared/vbet_extent_hollow.json b/Symbology/web/Shared/vbet_extent_hollow.json index 63fb5472..044c259c 100644 --- a/Symbology/web/Shared/vbet_extent_hollow.json +++ b/Symbology/web/Shared/vbet_extent_hollow.json @@ -11,7 +11,7 @@ "source-layer": "vbet_extent_hollow-2nztj2", "layout": {}, "paint": { - "line-dasharray": [1, 2], + "line-width": 0.26, "line-color": "hsl(0, 0%, 100%)" } }