Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(style): update style to match new config #2614

Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -19,21 +19,29 @@
]
}
},
"style": {
"layerStyle": {
"Polygon": {
"styleType": "simple",
"label": "LineString label",
"settings": {
"type": "filledPolygon",
"color": "rgba(0,0,255,0.5)",
"paternSize": 10,
"paternWidth": 2,
"fillStyle": "diagonalCross",
"stroke": {
"color": "rgba(128,0,0,1)",
"lineStyle": "dot"
"type": "simple",
"fields": [],
"hasDefault": false,
"info": [
{
"visible": true,
"label": "Polygon label",
"values": [],
"settings": {
"type": "filledPolygon",
"color": "rgba(0,0,255,0.5)",
"paternSize": 10,
"paternWidth": 2,
"fillStyle": "diagonalCross",
"stroke": {
"color": "rgba(128,0,0,1)",
"lineStyle": "dot"
}
}
}
}
]
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
{
"layerId": "msi-94-or-more",
"source": {
"style": "msi-binary"
"wmsStyle": "msi-binary"
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@
"layerId": "msi-94-or-more",
"layerName": "Permanent Snow",
"source": {
"style": "msi-binary",
"wmsStyle": "msi-binary",
"featureInfo": {
"queryable": true,
"nameField": "band-0-pixel-value",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
"layerFilter": "time = date'2023-04-18T07:00:00-04:00'",
"layerName": "Ice Cover",
"source": {
"style": "SEA_ICECONC"
"wmsStyle": "SEA_ICECONC"
}
}
]
Expand All @@ -60,7 +60,7 @@
"layerId": "msi-94-or-more",
"layerName": "Permanent Snow",
"source": {
"style": "msi-binary",
"wmsStyle": "msi-binary",
"featureInfo": {
"queryable": true,
"nameField": "band-0-pixel-value",
Expand All @@ -87,7 +87,7 @@
"layerId": "RADAR_1KM_RSNO",
"layerName": "Test Spatiotemporel",
"source": {
"style": "Radar-Snow_14colors"
"wmsStyle": "Radar-Snow_14colors"
}
}
]
Expand Down
90 changes: 40 additions & 50 deletions packages/geoview-core/public/configs/navigator/16-esri-dynamic.json

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"listOfLayerEntryConfig": [
{
"layerId": "0",
"geometryType": "point",
"layerName": "stations-Temporal",
"initialSettings": {
"controls": {
Expand Down Expand Up @@ -50,29 +49,32 @@
"source": {
"layerFilter": "Province = \\'Alberta\\' or Province = \\'Manitoba\\'"
},
"style": {
"type": "simple",
"hasDefault": false,
"info": [
{
"visible": true,
"label": "",
"values": [],
"settings": {
"type": "simpleSymbol",
"rotation": 0,
"color": "rgba(156,0,130,1)",
"stroke": {
"color": "rgba(0,0,0,1)",
"lineStyle": "solid",
"width": 1
},
"size": 2.668,
"symbol": "square",
"offset": [0, 0]
"layerStyle": {
"Point": {
"type": "simple",
"hasDefault": false,
"fields": [],
"info": [
{
"visible": true,
"label": "",
"values": [],
"settings": {
"type": "simpleSymbol",
"rotation": 0,
"color": "rgba(156,0,130,1)",
"stroke": {
"color": "rgba(0,0,0,1)",
"lineStyle": "solid",
"width": 1
},
"size": 2.668,
"symbol": "square",
"offset": [0, 0]
}
}
}
]
]
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"listOfLayerEntryConfig": [
{
"layerId": "0",
"geometryType": "point",
"layerName": "stations-Temporal",
"initialSettings": {
"controls": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@
"listOfLayerEntryConfig": [
{
"layerId": "0",
"geometryType": "point",
"layerName": "stations-Temporal",
"initialSettings": {
"controls": {
Expand Down Expand Up @@ -50,21 +49,25 @@
"source": {
"layerFilter": "Province = \\'Alberta\\' or Province = \\'Manitoba\\'"
},
"style": {
"type": "simple",
"hasDefault": false,
"info": [
{
"label": "",
"visible": false,
"settings": {
"symbol": "square",
"stroke": {
"color": "rgba(128,128,128,1)"
"layerStyle": {
"Point": {
"type": "simple",
"hasDefault": false,
"fields": [],
"info": [
{
"label": "",
"visible": false,
"values": [],
"settings": {
"symbol": "square",
"stroke": {
"color": "rgba(128,128,128,1)"
}
}
}
}
]
]
}
}
}
]
Expand Down
28 changes: 18 additions & 10 deletions packages/geoview-core/public/datasets/geojson/hydro-metadata.meta
Original file line number Diff line number Diff line change
Expand Up @@ -263,18 +263,26 @@
"initialSettings": {
"extent": [-177.29275972275843, 34.301384132573055, -9.977229778239453, 84.400481529465]
},
"style": {
"layerStyle": {
"LineString": {
"styleType": "simple",
"label": "Downstream Analysis",
"settings": {
"type": "lineString",
"stroke": {
"color": "rgba(230,123,38,1)",
"lineStyle": "shortDash-dot-dot",
"width": 2
"type": "simple",
"hasDefault": false,
"fields": [],
"info": [
{
"label": "Downstream Analysis",
"visible": true,
"values": [],
"settings": {
"type": "lineString",
"stroke": {
"color": "rgba(230,123,38,1)",
"lineStyle": "shortDash-dot-dot",
"width": 2
}
}
}
}
]
}
}
}
Expand Down
104 changes: 52 additions & 52 deletions packages/geoview-core/public/datasets/geojson/lines.json
Original file line number Diff line number Diff line change
@@ -1,52 +1,52 @@
{
"type": "FeatureCollection",
"features": [
{
"type": "Feature",
"properties": {
"Road_Number": 55,
"Province": "Quebec",
"creationDate": "28/05/2020T12:00:00-05:00"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-79, 49],
[-78, 46]
]
}
},
{
"type": "Feature",
"properties": {
"Road_Number": 55,
"Province": "Quebec",
"creationDate": "14/09/2021T13:00:00-05:00"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-78, 49],
[-76, 46],
[-77, 49]
]
}
},
{
"type": "Feature",
"properties": {
"Road_Number": 20,
"Province": "Ontario",
"creationDate": "25/12/2020T12:00:00-05:00"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-81, 51],
[-80.5, 46],
[-80, 49]
]
}
}
]
}
{
"type": "FeatureCollection",
"features": [
{
"type": "Feature",
"properties": {
"Road_Number": 55,
"Province": "Quebec",
"creationDate": "28/05/2020T12:00:00-05:00"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-79, 49],
[-78, 46]
]
}
},
{
"type": "Feature",
"properties": {
"Road_Number": 55,
"Province": "Quebec",
"creationDate": "14/09/2021T13:00:00-05:00"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-78, 49],
[-76, 46],
[-77, 49]
]
}
},
{
"type": "Feature",
"properties": {
"Road_Number": 20,
"Province": "Ontario",
"creationDate": "25/12/2020T12:00:00-05:00"
},
"geometry": {
"type": "LineString",
"coordinates": [
[-81, 51],
[-80.5, 46],
[-80, 49]
]
}
}
]
}
22 changes: 15 additions & 7 deletions packages/geoview-core/public/datasets/geojson/metadata-blank.meta
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,22 @@
]
}
},
"style": {
"layerStyle": {
"Point": {
"styleType": "simple",
"label": "Point label",
"settings": {
"type": "simpleSymbol",
"symbol": "star"
}
"type": "simple",
"hasDefault": false,
"fields": [],
"info": [
{
"label": "Point label",
"visible": true,
"values": [],
"settings": {
"type": "simpleSymbol",
"symbol": "star"
}
}
]
}
}
}
Expand Down
Loading
Loading