diff --git a/guide/wis2-guide-DRAFT.docx b/guide/wis2-guide-DRAFT.docx index c1b3168..aa35671 100644 Binary files a/guide/wis2-guide-DRAFT.docx and b/guide/wis2-guide-DRAFT.docx differ diff --git a/guide/wis2-guide-DRAFT.html b/guide/wis2-guide-DRAFT.html index 07f8378..90beba3 100644 --- a/guide/wis2-guide-DRAFT.html +++ b/guide/wis2-guide-DRAFT.html @@ -2578,10 +2578,10 @@

This section of the Guide outlines how such an organisation may efficiently fulfil the requirements in providing required data/information to the two systems. It proposes an interoperability approach between WIS2 and SWIM where meteorological -data published via WIS2 is automatically propagated to SWIM.

+data published via WIS2 can be automatically propagated to SWIM.

-

This Guide covers only how data from WIS2 is published into SWIM. +

This Guide covers only how data from WIS2 can be published into SWIM. Consumption of information from SWIM services is not in scope.

@@ -2624,10 +2624,10 @@
<
Schematic of interoperability approach
-
Figure 1. Schematic of interoperability approach
+
Figure 1. Schematic of an interoperability approach
-

The Gateway operates as an "adapter" between WIS2 and SWIM, pulling +

The Gateway can operate as an "adapter" between WIS2 and SWIM by pulling the requisite meteorological data from WIS2 and re-publishing it to SWIM.

@@ -2647,7 +2647,7 @@

Where a new WIS2 Node is needed, the responsible organisation must -establish a new WIS2 Node and register it with WMO Secretariat. For more information, see [registration_and_decommissioning_of_a_wis2_node].

+establish a new WIS2 Node and register it with WMO Secretariat. For more information, see Implementation and operation of a WIS2 Node.

Datasets are a central concept in WIS2. Where meteorological data is published via WIS2, it shall be packaged into -“Datasets”. The data should be grouped at the country / territory +“datasets”. The data should be grouped at the country / territory level; i.e., datasets should be published for a given country / territory, one for each datatype (e.g., aerodrome observation, aerodrome forecast and quantitative volcanic ash @@ -2695,10 +2695,7 @@

-

The WMO Unified Data Policy requires transparency on the conditions of use for Recommended Data. Conditions regarding the use of aeronautical meteorological information are specified in ICAO Annex 3 and, optionally, by the ICAO Contracting State. Such conditions of use should be explicitly stated.

-
-
-

The responsible organisation must publish discovery metadata for each dataset. Note that:

+

The WMO Unified Data Policy requires transparency on the conditions of use for Recommended Data. Conditions regarding the use of aeronautical meteorological information are specified in ICAO Annex 3 and, optionally, by the ICAO Contracting State. Such conditions of use should be explicitly stated in the discovery metadata for each dataset as describe below.

    @@ -2785,11 +2782,8 @@
    Gateway implementation
    -

    The relationships between the Gateway component, WIS2 and SWIM are -illustrated in the figure below[57].

    -
    -
    -

    These interactions are illustrated in the below figure:

    +

    The potential interactions between the Gateway component, WIS2 and SWIM are +illustrated in the figure below[57]

    @@ -2872,7 +2866,7 @@
    SWIM service
    -

    The SWIM aviation weather information service comprises a Message Broker +

    The SWIM aviation weather information service may comprise of a Message Broker component which implements the AMQP 1.0 messaging standard[62].

    @@ -3571,7 +3565,7 @@

    5.1. Competen 50. The PANS-IM is expected to available on ICAO NET by July 2024 and become applicable in November 2024. Information provided in herein is based on best understanding of draft proposals from ICAO.

    -51. AMQP 1.0 is proposed in the draft PANS-IM +51. AMQP 1.0 is one of the protocols proposed in the draft PANS-IM
    52. IWXXM (FM205) is defined in the Manual on Codes (WMO-No. 306), Volume I.3 – International Codes @@ -3589,7 +3583,7 @@

    5.1. Competen 56. Where the data resource does not exceed 4Kb, it may additionally be embedded in the notification message.

    -57. Note that the figure simplifies the transmission of discovery metadata from WIS2 Node to the Global Discovery Catalogue. In reality, the WIS2 Node publishes notification messages advertising the availability of new discovery metadata resource at a given URL. These messages are republished by the Global Broker. The Global Discovery Catalogue subscribes to a Global Broker and downloads the discovery metadata from the WIS2 Node using the URL supplied in the message +57. Note that the figure simplifies the transmission of discovery metadata from WIS2 Node to the Global Discovery Catalogue. In reality, the WIS2 Node publishes notification messages advertising the availability of new discovery metadata resource at a given URL. These messages are republished by the Global Broker. The Global Discovery Catalogue subscribes to a Global Broker and downloads the discovery metadata from the WIS2 Node using the URL supplied in the message.
    58. WIS2 recommends that one subscribes to notifications from a Global Broker. However, where both Gateway and WIS Node are operated by the same organisation, it may be advantageous to subscribe directly to the local message broker of WIS2 Node, e.g., to reduce latency. @@ -3624,7 +3618,7 @@

    5.1. Competen

    diff --git a/guide/wis2-guide-DRAFT.pdf b/guide/wis2-guide-DRAFT.pdf index 7befd95..34ffa36 100644 Binary files a/guide/wis2-guide-DRAFT.pdf and b/guide/wis2-guide-DRAFT.pdf differ