From 2de58c50e106722afa99f285689b9d16c23f462b Mon Sep 17 00:00:00 2001 From: Lorin Gaertner Date: Wed, 20 Aug 2025 11:57:13 -0400 Subject: [PATCH 1/3] add symbology for RSContextNZ lakes (mostly testing the symbology instructions) --- Symbology/qgis/RSContextNZ/lakes.qml | 210 +++++++++++++++++++++++++++ Symbology/web/RSContextNZ/lakes.json | 31 ++++ 2 files changed, 241 insertions(+) create mode 100644 Symbology/qgis/RSContextNZ/lakes.qml create mode 100644 Symbology/web/RSContextNZ/lakes.json diff --git a/Symbology/qgis/RSContextNZ/lakes.qml b/Symbology/qgis/RSContextNZ/lakes.qml new file mode 100644 index 00000000..03f9ff97 --- /dev/null +++ b/Symbology/qgis/RSContextNZ/lakes.qml @@ -0,0 +1,210 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 2 + diff --git a/Symbology/web/RSContextNZ/lakes.json b/Symbology/web/RSContextNZ/lakes.json new file mode 100644 index 00000000..010359d3 --- /dev/null +++ b/Symbology/web/RSContextNZ/lakes.json @@ -0,0 +1,31 @@ +{ + "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json", + "legend": [], + "layerStyles": +[ + { + "id": "nzlakessample-nocrs-bbiue2", + "type": "fill", + "source": "composite", + "source-layer": "nzlakessample-nocrs-bbiue2", + "paint": { + "fill-color": "hsla(234, 100%, 40%, 0.46)", + "fill-opacity": 0.91 + } + }, + { + "id": "nzlakessample-nocrs-label", + "type": "symbol", + "source": "composite", + "source-layer": "nzlakessample-nocrs-bbiue2", + "layout": { + "text-field": ["to-string", ["get", "name"]], + "text-font": [ + "PT Serif Bold Italic", + "Arial Unicode MS Regular" + ] + }, + "paint": {"text-color": "hsla(234, 100%, 40%, 0.46)"} + } + ] +} \ No newline at end of file From d3a372c8d55352582657472452dbf9f695865021 Mon Sep 17 00:00:00 2001 From: Lorin Gaertner Date: Wed, 20 Aug 2025 12:14:57 -0400 Subject: [PATCH 2/3] migrating vector.schema.json from draft-04 to draft-07 --- Symbology/web/vector.schema.json | 62 +++++++++++++------------------- 1 file changed, 25 insertions(+), 37 deletions(-) diff --git a/Symbology/web/vector.schema.json b/Symbology/web/vector.schema.json index fb02c6a1..42d4b875 100644 --- a/Symbology/web/vector.schema.json +++ b/Symbology/web/vector.schema.json @@ -1,51 +1,39 @@ { - "$schema": "http://json-schema.org/draft-04/schema#", + "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { "legend": { "type": "array", "items": { "type": "array", - "items": [ - {"type":"string"}, - {"type":"string"} - ] + "prefixItems": [ + {"type": "string"}, + {"type": "string"} + ], + "minItems": 2, + "maxItems": 2 } }, "layerStyles": { "type": "array", - "items": [ - { - "type": "object", - "properties": { - "id": { - "type": "string" - }, - "type": { - "type": "string" - }, - "source": { - "type": "string" - }, - "source-layer": { - "type": "string" - }, - "layout": { - "type": "object" - }, - "paint": { - "type": "object" - } - }, - "required": [ - "id", - "type", - "source", - "source-layer", - "paint" - ] - } - ] + "items": { + "type": "object", + "properties": { + "id": { "type": "string" }, + "type": { "type": "string" }, + "source": { "type": "string" }, + "source-layer": { "type": "string" }, + "layout": { "type": "object" }, + "paint": { "type": "object" } + }, + "required": [ + "id", + "type", + "source", + "source-layer", + "paint" + ] + } } }, "required": [ From 3cc2eae62985fa03e68a389bdbc29afd877795e2 Mon Sep 17 00:00:00 2001 From: Lorin Gaertner Date: Wed, 20 Aug 2025 12:27:25 -0400 Subject: [PATCH 3/3] Revert "add symbology for RSContextNZ lakes (mostly testing the symbology instructions)" This reverts commit 2de58c50e106722afa99f285689b9d16c23f462b. --- Symbology/qgis/RSContextNZ/lakes.qml | 210 --------------------------- Symbology/web/RSContextNZ/lakes.json | 31 ---- 2 files changed, 241 deletions(-) delete mode 100644 Symbology/qgis/RSContextNZ/lakes.qml delete mode 100644 Symbology/web/RSContextNZ/lakes.json diff --git a/Symbology/qgis/RSContextNZ/lakes.qml b/Symbology/qgis/RSContextNZ/lakes.qml deleted file mode 100644 index 03f9ff97..00000000 --- a/Symbology/qgis/RSContextNZ/lakes.qml +++ /dev/null @@ -1,210 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0 - 0 - 2 - diff --git a/Symbology/web/RSContextNZ/lakes.json b/Symbology/web/RSContextNZ/lakes.json deleted file mode 100644 index 010359d3..00000000 --- a/Symbology/web/RSContextNZ/lakes.json +++ /dev/null @@ -1,31 +0,0 @@ -{ - "$schema": "https://xml.riverscapes.net/Symbology/web/vector.schema.json", - "legend": [], - "layerStyles": -[ - { - "id": "nzlakessample-nocrs-bbiue2", - "type": "fill", - "source": "composite", - "source-layer": "nzlakessample-nocrs-bbiue2", - "paint": { - "fill-color": "hsla(234, 100%, 40%, 0.46)", - "fill-opacity": 0.91 - } - }, - { - "id": "nzlakessample-nocrs-label", - "type": "symbol", - "source": "composite", - "source-layer": "nzlakessample-nocrs-bbiue2", - "layout": { - "text-field": ["to-string", ["get", "name"]], - "text-font": [ - "PT Serif Bold Italic", - "Arial Unicode MS Regular" - ] - }, - "paint": {"text-color": "hsla(234, 100%, 40%, 0.46)"} - } - ] -} \ No newline at end of file