update WMCP 2 build

wmo-im · Aug 5, 2024 · 94b92ee · 94b92ee
1 parent 8f40edf
commit 94b92ee
Show file tree

Hide file tree

Showing 6 changed files with 159 additions and 5 deletions.
diff --git a/kpi/wcmp2-kpi-DRAFT.docx b/kpi/wcmp2-kpi-DRAFT.docx
diff --git a/kpi/wcmp2-kpi-DRAFT.html b/kpi/wcmp2-kpi-DRAFT.html
@@ -455,7 +455,7 @@ <h1>WMO Core Metadata Profile 2, Key Performance Indicators</h1>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock"><strong class="big">World Meteorological Organization</strong></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-08-02</p></td>
+<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-08-05</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Version: 2.0.0</p></td>
@@ -1581,7 +1581,7 @@ <h3 id="_rules_7"><a class="anchor" href="#_rules_7"></a>2.8. Rules</h3>
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-08-02 11:31:00 UTC
+Last updated 2024-08-05 10:03:17 UTC
 </div>
 </div>
 </body>

diff --git a/kpi/wcmp2-kpi-DRAFT.pdf b/kpi/wcmp2-kpi-DRAFT.pdf
diff --git a/standard/wcmp2-DRAFT.docx b/standard/wcmp2-DRAFT.docx
diff --git a/standard/wcmp2-DRAFT.html b/standard/wcmp2-DRAFT.html
@@ -455,7 +455,7 @@ <h1>WMO Core Metadata Profile (WCMP) Version 2</h1>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock"><strong class="big">World Meteorological Organization</strong></p></td>
 </tr>
 <tr>
-<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-08-02</p></td>
+<td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Date: 2024-08-05</p></td>
 </tr>
 <tr>
 <td class="tableblock halign-left valign-top" style="background-color: #FFFFFF;"><p class="tableblock">Version: 2.0.0</p></td>
@@ -6233,7 +6233,161 @@ <h3 id="_wmo_core_metadata_profile_examples"><a class="anchor" href="#_wmo_core_
 <div class="listingblock">
 <div class="title">Example: WIS2 Global Broker (service)</div>
 <div class="content">
-<pre class="highlight"><code class="language-json" data-lang="json">Unresolved directive in sections/annex_c_examples.adoc - include::../../examples/fr-meteo-france.global-broker.json[]</code></pre>
+<pre class="highlight"><code class="language-json" data-lang="json">{
+    "id": "urn:wmo:md:fr-meteofrance-global-broker:gb",
+    "type": "Feature",
+    "conformsTo": [
+        "http://wis.wmo.int/spec/wcmp/2/conf/core"
+    ],
+    "time": null,
+    "geometry": {
+        "type": "Polygon",
+        "coordinates": [
+            [
+                [
+                    -180,
+                    -90
+                ],
+                [
+                    -180,
+                    90
+                ],
+                [
+                    180,
+                    90
+                ],
+                [
+                    180,
+                    -90
+                ],
+                [
+                    -180,
+                    -90
+                ]
+            ]
+        ]
+    },
+    "properties": {
+        "type": "service",
+        "title": "WIS2 Broker - M\u00e9t\u00e9o-France",
+        "description": "TODO",
+        "themes": [
+            {
+                "concepts": [
+                    {
+                        "id": "weather",
+                        "title": "Weather",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/weather"
+                    },
+                    {
+                        "id": "climate",
+                        "title": "Climate",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/climate"
+                    },
+                    {
+                        "id": "hydrology",
+                        "title": "Hydrology",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/hydrology"
+                    },
+                    {
+                        "id": "atmospheric-composition",
+                        "title": "Atmospheric Composition",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/atmospheric-composition"
+                    },
+                    {
+                        "id": "cryosphere",
+                        "title": "Cryosphere",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/cryosphere"
+                    },
+                    {
+                        "id": "ocean",
+                        "title": "Ocean",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/ocean"
+                    },
+                    {
+                        "id": "space-weather",
+                        "title": "Space Weather",
+                        "url": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline/space-weather"
+                    }
+                ],
+                "scheme": "https://codes.wmo.int/wis/topic-hierarchy/earth-system-discipline"
+            },
+            {
+                "concepts": [
+                    {
+                        "id": "global-broker",
+                        "title": "Global Broker",
+                        "url": "https://codes.wmo.int/wis/service-types/global-broker"
+                    }
+                ],
+                "scheme": "https://codes.wmo.int/wis/service-types"
+            }
+        ],
+        "contacts": [
+            {
+                "identifier": "meteo-france",
+                "organization": "M\u00e9t\u00e9o-France",
+                "name": "David Podeur",
+                "emails": [
+                    {
+                        "value": "gisc_support@meteo.fr"
+                    }
+                ],
+                "addresses": [
+                    {
+                        "deliveryPoint": [
+                            "42 Avenue Coriolis"
+                        ],
+                        "city": "Toulouse",
+                        "postalCode": "31057",
+                        "country": "France"
+                    }
+                ],
+                "links": [
+                    {
+                        "rel": "about",
+                        "type": "text/html",
+                        "href": "https://donneespubliques.meteofrance.fr"
+                    }
+                ],
+                "contactInstructions": "email",
+                "roles": [
+                    "host"
+                ]
+            }
+        ],
+        "created": "2022-11-11T11:00:00Z",
+        "keywords": [
+            "wis2",
+            "global discovery catalogue",
+            "metadata"
+        ]
+    },
+    "links": [
+        {
+            "rel": "items",
+            "type": "application/geo+json",
+            "title": "WMO WIS2 Global Broker - M\u00e9t\u00e9o-France",
+            "href": "mqtts://everyone:everyone@example.org:8883",
+            "channel": "cache/a/wis2/#",
+            "distribution": {
+                "maxMSGsize": 4096,
+                "unit": "bytes"
+            }
+        },
+        {
+            "rel": "related",
+            "type": "application/json",
+            "title": "WMO WIS Global Broker - China Meteorological Administration",
+            "href": "mqtts://everyone:everyone@example.org:8883",
+            "channel": "cache/a/wis2/#",
+            "distribution": {
+                "maxMSGsize": 4096,
+                "unit": "bytes"
+            }
+        }
+    ]
+}</code></pre>
 </div>
 </div>
 </div>
@@ -6419,7 +6573,7 @@ <h2 id="_revision_history"><a class="anchor" href="#_revision_history"></a>Annex
 </div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2024-08-02 11:31:00 UTC
+Last updated 2024-08-05 10:03:17 UTC
 </div>
 </div>
 </body>

diff --git a/standard/wcmp2-DRAFT.pdf b/standard/wcmp2-DRAFT.pdf