Updated to use hasResult in observations.

Raul Garcia-Castrorequested to merge
issue-3 into develop-v2.1.1

Changes performed in TS, diagrams, documentation and examples

Closes #3 (closed)

Merge request reports

diagrams/SAREF4WATR examples.drawio

+408 −330
Changes for diagrams/SAREF4WATR examples.drawio: 408 added lines, 330 removed lines.
Original line number Diff line number Diff line 
<mxfile host="Electron" modified="2024-04-25T11:42:46.278Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.2.5 Chrome/120.0.6099.109 Electron/28.1.0 Safari/537.36" etag="o9BSpkS_Uqf8DFtoaAru" version="24.2.5" type="device" pages="6">

<mxfile host="Electron" modified="2024-05-31T14:52:12.203Z" agent="Mozilla/5.0 (Macintosh; Intel Mac OS X 10_15_7) AppleWebKit/537.36 (KHTML, like Gecko) draw.io/24.4.8 Chrome/124.0.6367.207 Electron/30.0.6 Safari/537.36" etag="pAXW6tMSazpqTLJ2HvzG" version="24.4.8" type="device" pages="6">

  <diagram name="Water Meter" id="7StWjrC59b7MtaYeR-BC">

    <mxGraphModel dx="2589" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

    <mxGraphModel dx="2258" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

      <root>

        <mxCell id="UoIeGqhHTO__Xtlh26Lv-0" />

        <mxCell id="UoIeGqhHTO__Xtlh26Lv-1" parent="UoIeGqhHTO__Xtlh26Lv-0" />
@@ -165,11 +165,11 @@ 
        <mxCell id="UoIeGqhHTO__Xtlh26Lv-53" value="&quot;Meterall&quot;" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-220" y="-776" width="70" height="25" as="geometry" />

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-2" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

        <mxCell id="6SMQOBCAEm36FLkuKaD9-2" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-995.25" y="-517" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-3" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-776" y="-330" width="130" height="25" as="geometry" />

          <mxGeometry x="-530" y="-326" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.648;entryY=0.96;entryDx=0;entryDy=0;entryPerimeter=0;exitX=0.658;exitY=-0.04;exitDx=0;exitDy=0;exitPerimeter=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="6SMQOBCAEm36FLkuKaD9-2" target="06MvrXrdmsQjl4xO1CiC-8" edge="1">

          <mxGeometry relative="1" as="geometry">
@@ -177,9 +177,9 @@ 
            <mxPoint x="-879" y="-516" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-10" value="saref:relatesToProperty" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-9" vertex="1" connectable="0">

        <mxCell id="6SMQOBCAEm36FLkuKaD9-10" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-9" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="71.5" y="33.03" as="offset" />

            <mxPoint x="47" y="33" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.328;entryY=-0.02;entryDx=0;entryDy=0;entryPerimeter=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" target="6SMQOBCAEm36FLkuKaD9-2" edge="1">
@@ -188,9 +188,9 @@ 
            <mxPoint x="-950" y="-355" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-12" value="saref:relatesToMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-11" vertex="1" connectable="0">

        <mxCell id="6SMQOBCAEm36FLkuKaD9-12" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-11" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="-90" y="-28" as="offset" />

            <mxPoint x="-63" y="-28" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=1;entryY=0.75;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" target="06MvrXrdmsQjl4xO1CiC-8" edge="1">
@@ -210,7 +210,7 @@ 
            <mxPoint x="-630" y="-516" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-21" value="saref:isMeasurementOf" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-20" vertex="1" connectable="0">

        <mxCell id="6SMQOBCAEm36FLkuKaD9-21" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-20" vertex="1" connectable="0">

          <mxGeometry x="-0.262" y="-1" relative="1" as="geometry">

            <mxPoint x="-78.75" y="10.11" as="offset" />

          </mxGeometry>
@@ -221,12 +221,12 @@ 
            <mxPoint x="-833.2142857142858" y="-315" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-23" value="saref:hasMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-22" vertex="1" connectable="0">

        <mxCell id="6SMQOBCAEm36FLkuKaD9-23" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="6SMQOBCAEm36FLkuKaD9-22" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="-3" y="-12.08" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="6SMQOBCAEm36FLkuKaD9-27" value="ex:WMMeasurement200206" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

        <mxCell id="6SMQOBCAEm36FLkuKaD9-27" value="ex:WMObservation200206" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-995.25" y="-492" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="BQnqx_Om5b0ZZPrEVfAr-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" target="BQnqx_Om5b0ZZPrEVfAr-11" edge="1">
@@ -237,19 +237,19 @@ 
        </mxCell>

        <mxCell id="BQnqx_Om5b0ZZPrEVfAr-3" value="geo:hasGeometry" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="BQnqx_Om5b0ZZPrEVfAr-2" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="67" y="73" as="offset" />

            <mxPoint x="61" y="75" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="BQnqx_Om5b0ZZPrEVfAr-11" value="sf:Point" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-568" y="-409" width="100" height="25" as="geometry" />

          <mxGeometry x="-568" y="-445" width="100" height="25" as="geometry" />

        </mxCell>

        <mxCell id="pNBzeqnqrmdX8skFnfmp-0" value="ex:MeterGeom" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-568" y="-384" width="100" height="25" as="geometry" />

          <mxGeometry x="-568" y="-420" width="100" height="25" as="geometry" />

        </mxCell>

        <mxCell id="pNBzeqnqrmdX8skFnfmp-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="pNBzeqnqrmdX8skFnfmp-0" target="pNBzeqnqrmdX8skFnfmp-4" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-451" y="-195" as="sourcePoint" />

            <mxPoint x="-221" y="-195" as="targetPoint" />

            <mxPoint x="-451" y="-231" as="sourcePoint" />

            <mxPoint x="-221" y="-231" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="pNBzeqnqrmdX8skFnfmp-2" value="geo:asWKT" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="pNBzeqnqrmdX8skFnfmp-1" vertex="1" connectable="0">
@@ -258,7 +258,7 @@ 
          </mxGeometry>

        </mxCell>

        <mxCell id="pNBzeqnqrmdX8skFnfmp-4" value="&quot;POINT (&lt;span id=&quot;latlngspan&quot; class=&quot;coordinatetxt&quot;&gt;-3.705346&lt;/span&gt;&amp;nbsp;&lt;span id=&quot;latlngspan&quot; class=&quot;coordinatetxt&quot;&gt;40.417351&lt;/span&gt;)&quot; ^^geo:wktLiteral" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-340" y="-386.5" width="190" height="30" as="geometry" />

          <mxGeometry x="-340" y="-422.5" width="190" height="30" as="geometry" />

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="6SMQOBCAEm36FLkuKaD9-27" target="06MvrXrdmsQjl4xO1CiC-2" edge="1">

          <mxGeometry relative="1" as="geometry">
@@ -266,7 +266,7 @@ 
            <mxPoint x="-840" y="-390" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-1" value="saref:hasTimestamp" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="06MvrXrdmsQjl4xO1CiC-0" vertex="1" connectable="0">

        <mxCell id="06MvrXrdmsQjl4xO1CiC-1" value="saref:hasResultTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="06MvrXrdmsQjl4xO1CiC-0" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="47" y="-13" as="offset" />

          </mxGeometry>
@@ -274,19 +274,19 @@ 
        <mxCell id="06MvrXrdmsQjl4xO1CiC-2" value="&quot;2020-02-06T15:44:12&quot; ^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-776" y="-409" width="141" height="30" as="geometry" />

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="6SMQOBCAEm36FLkuKaD9-27" target="06MvrXrdmsQjl4xO1CiC-6" edge="1">

        <mxCell id="06MvrXrdmsQjl4xO1CiC-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="uxshAsQ-pq_VCYGoTzUm-3" target="06MvrXrdmsQjl4xO1CiC-6" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-1070" y="-350" as="sourcePoint" />

            <mxPoint x="-840" y="-350" as="targetPoint" />

            <mxPoint x="-1070" y="-344" as="sourcePoint" />

            <mxPoint x="-840" y="-344" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-5" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="06MvrXrdmsQjl4xO1CiC-4" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="49.02" y="-7" as="offset" />

            <mxPoint x="2" y="-34" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-6" value="&quot;27&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-776" y="-369" width="130" height="25" as="geometry" />

          <mxGeometry x="-530" y="-360" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-7" value="s4watr:WaterMeterProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-1001" y="-661" width="187.5" height="25" as="geometry" />
@@ -294,25 +294,42 @@ 
        <mxCell id="06MvrXrdmsQjl4xO1CiC-8" value="s4watr:BatteryRemainingTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-1001" y="-636" width="187.5" height="25" as="geometry" />

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="6SMQOBCAEm36FLkuKaD9-27" target="06MvrXrdmsQjl4xO1CiC-11" edge="1">

        <mxCell id="06MvrXrdmsQjl4xO1CiC-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="UoIeGqhHTO__Xtlh26Lv-1" source="uxshAsQ-pq_VCYGoTzUm-3" target="06MvrXrdmsQjl4xO1CiC-11" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-1050" y="-260" as="sourcePoint" />

            <mxPoint x="-820" y="-260" as="targetPoint" />

            <mxPoint x="-1050" y="-254" as="sourcePoint" />

            <mxPoint x="-820" y="-254" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-10" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="06MvrXrdmsQjl4xO1CiC-9" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="59.07" y="29" as="offset" />

            <mxPoint x="-5" y="39" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="06MvrXrdmsQjl4xO1CiC-11" value="om:month" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="UoIeGqhHTO__Xtlh26Lv-1" vertex="1">

          <mxGeometry x="-776" y="-305" width="130" height="25" as="geometry" />

          <mxGeometry x="-530" y="-301" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-0" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="UoIeGqhHTO__Xtlh26Lv-1">

          <mxGeometry x="-776" y="-359" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="UoIeGqhHTO__Xtlh26Lv-1" target="uxshAsQ-pq_VCYGoTzUm-3" source="6SMQOBCAEm36FLkuKaD9-27">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="-907" y="-576" as="sourcePoint" />

            <mxPoint x="-820" y="-369" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-2" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="uxshAsQ-pq_VCYGoTzUm-1">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="51" y="9" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="uxshAsQ-pq_VCYGoTzUm-3" value="ex:27Months" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="UoIeGqhHTO__Xtlh26Lv-1">

          <mxGeometry x="-776" y="-334" width="130" height="25" as="geometry" />

        </mxCell>

      </root>

    </mxGraphModel>

  </diagram>

  <diagram name="Meter Measurement" id="caw47RoeLyteLslpZ8tP">

    <mxGraphModel dx="1420" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="1" shadow="0">

    <mxGraphModel dx="1452" dy="1831" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="1" shadow="0">

      <root>

        <mxCell id="5CDmAUpphAsoas8BXQOl-0" />

        <mxCell id="5CDmAUpphAsoas8BXQOl-1" parent="5CDmAUpphAsoas8BXQOl-0" />
@@ -322,9 +339,9 @@ 
            <mxPoint x="434" y="-684" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="5CDmAUpphAsoas8BXQOl-12" value="saref:relatesToProperty" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="5CDmAUpphAsoas8BXQOl-11" vertex="1" connectable="0">

        <mxCell id="5CDmAUpphAsoas8BXQOl-12" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="5CDmAUpphAsoas8BXQOl-11" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="69.96" y="-17.670000000000005" as="offset" />

            <mxPoint x="47" y="-18" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="5CDmAUpphAsoas8BXQOl-13" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.26;entryY=0.009;entryDx=0;entryDy=0;entryPerimeter=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="IAVRhp8LTkazsg9SFrNp-6" target="hFlYh1SpmCDU3HOESGsm-0" edge="1">
@@ -333,9 +350,9 @@ 
            <mxPoint x="362" y="-525" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="5CDmAUpphAsoas8BXQOl-14" value="saref:relatesToMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="5CDmAUpphAsoas8BXQOl-13" vertex="1" connectable="0">

        <mxCell id="5CDmAUpphAsoas8BXQOl-14" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="5CDmAUpphAsoas8BXQOl-13" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="-90" y="-24.17" as="offset" />

            <mxPoint x="-67" y="-24" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="5CDmAUpphAsoas8BXQOl-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="Me7MrJQuWpTjeJUokv3z-0" target="hFlYh1SpmCDU3HOESGsm-2" edge="1">
@@ -343,35 +360,32 @@ 
            <mxPoint x="99" y="-500.5" as="sourcePoint" />

            <mxPoint x="312" y="-500.5" as="targetPoint" />

            <Array as="points">

              <mxPoint x="199" y="-387" />

              <mxPoint x="199" y="-479" />

              <mxPoint x="250" y="-360" />

              <mxPoint x="250" y="-479" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="5CDmAUpphAsoas8BXQOl-16" value="saref:makesMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="5CDmAUpphAsoas8BXQOl-15" vertex="1" connectable="0">

        <mxCell id="5CDmAUpphAsoas8BXQOl-16" value="saref:madeExecution" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="5CDmAUpphAsoas8BXQOl-15" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="62.66000000000001" y="26.33" as="offset" />

            <mxPoint x="64" y="-19" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="5CDmAUpphAsoas8BXQOl-30" value="time:Interval" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="662.25" y="-389" width="137.75" height="25" as="geometry" />

          <mxGeometry x="662.25" y="-328" width="137.75" height="25" as="geometry" />

        </mxCell>

        <mxCell id="IAVRhp8LTkazsg9SFrNp-6" value="s4watr:FlowVolume" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="320" y="-635" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="Me7MrJQuWpTjeJUokv3z-0" value="ex:Meter4837QW123" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="30" y="-399" width="150" height="25" as="geometry" />

          <mxGeometry x="30" y="-373" width="150" height="25" as="geometry" />

        </mxCell>

        <mxCell id="Me7MrJQuWpTjeJUokv3z-1" value="s4watr:WaterMeter" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=top;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="30" y="-423" width="150" height="25" as="geometry" />

          <mxGeometry x="30" y="-397" width="150" height="25" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-0" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

        <mxCell id="hFlYh1SpmCDU3HOESGsm-0" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="316.75" y="-523" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-1" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="659" y="-474" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-2" value="ex:WFMeasurement170206" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

        <mxCell id="hFlYh1SpmCDU3HOESGsm-2" value="ex:WFObservation170206" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="316.75" y="-498" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-3" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="hFlYh1SpmCDU3HOESGsm-2" target="hFlYh1SpmCDU3HOESGsm-5" edge="1">
@@ -379,171 +393,92 @@ 
            <mxPoint x="242" y="-396" as="sourcePoint" />

            <mxPoint x="472" y="-396" as="targetPoint" />

            <Array as="points">

              <mxPoint x="519" y="-485" />

              <mxPoint x="519" y="-544" />

              <mxPoint x="519" y="-486" />

              <mxPoint x="519" y="-555" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-4" value="saref:hasTimestamp" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="hFlYh1SpmCDU3HOESGsm-3" vertex="1" connectable="0">

        <mxCell id="hFlYh1SpmCDU3HOESGsm-4" value="saref:hasResultTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="hFlYh1SpmCDU3HOESGsm-3" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="54.5" y="-17" as="offset" />

            <mxPoint x="59" y="13" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-5" value="&quot;2020-02-06T15:07:12&quot; ^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="659" y="-559" width="141" height="30" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="hFlYh1SpmCDU3HOESGsm-2" target="hFlYh1SpmCDU3HOESGsm-8" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="242" y="-356" as="sourcePoint" />

            <mxPoint x="472" y="-356" as="targetPoint" />

            <Array as="points">

              <mxPoint x="519" y="-485" />

              <mxPoint x="519" y="-506" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-7" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="hFlYh1SpmCDU3HOESGsm-6" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="16" y="-15" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-8" value="&quot;127&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="659" y="-519" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-9" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="hFlYh1SpmCDU3HOESGsm-2" target="hFlYh1SpmCDU3HOESGsm-11" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="262" y="-266" as="sourcePoint" />

            <mxPoint x="492" y="-266" as="targetPoint" />

            <Array as="points">

              <mxPoint x="519" y="-485" />

              <mxPoint x="519" y="-436" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-10" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="hFlYh1SpmCDU3HOESGsm-9" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="41" y="-15" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-11" value="om:litre" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="659" y="-449" width="130" height="25" as="geometry" />

          <mxGeometry x="659" y="-570" width="141" height="30" as="geometry" />

        </mxCell>

        <mxCell id="hFlYh1SpmCDU3HOESGsm-12" value="s4watr:WaterFlowProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="320" y="-660" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-0" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.699;entryY=0.048;entryDx=0;entryDy=0;exitX=0.714;exitY=1.001;exitDx=0;exitDy=0;exitPerimeter=0;entryPerimeter=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-7" target="73DPLS-I4gKHyQWZKQc8-17" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="450.25" y="-329" as="sourcePoint" />

            <mxPoint x="437.25" y="-489" as="targetPoint" />

            <mxPoint x="450.25" y="-268" as="sourcePoint" />

            <mxPoint x="437.25" y="-428" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-1" value="saref:relatesToProperty" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-0" vertex="1" connectable="0">

        <mxCell id="73DPLS-I4gKHyQWZKQc8-1" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-0" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="77.32" y="14.009999999999994" as="offset" />

            <mxPoint x="54" y="14" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.25;entryY=1;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" target="73DPLS-I4gKHyQWZKQc8-7" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="364" y="-197" as="sourcePoint" />

            <mxPoint x="362" y="-277" as="targetPoint" />

            <mxPoint x="364" y="-136" as="sourcePoint" />

            <mxPoint x="362" y="-216" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-3" value="saref:relatesToMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-2" vertex="1" connectable="0">

        <mxCell id="73DPLS-I4gKHyQWZKQc8-3" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-2" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="-90" y="20.950000000000003" as="offset" />

            <mxPoint x="-67" y="21" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-4" value="s4watr:ExternalTemperature" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="313" y="-174" width="190" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-5" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="320" y="-328" width="176" height="25" as="geometry" />

          <mxGeometry x="313" y="-113" width="190" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-6" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="662.25" y="-279" width="130" height="25" as="geometry" />

        <mxCell id="73DPLS-I4gKHyQWZKQc8-5" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="320" y="-267" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-7" value="ex:WFMeasurement643234" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="320" y="-303" width="176" height="25" as="geometry" />

        <mxCell id="73DPLS-I4gKHyQWZKQc8-7" value="ex:WFObservation643234" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="320" y="-242" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-7" target="73DPLS-I4gKHyQWZKQc8-10" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="245.25" y="-201" as="sourcePoint" />

            <mxPoint x="630" y="-334" as="targetPoint" />

            <mxPoint x="245.25" y="-140" as="sourcePoint" />

            <mxPoint x="630" y="-273" as="targetPoint" />

            <Array as="points">

              <mxPoint x="520" y="-290" />

              <mxPoint x="520" y="-351" />

              <mxPoint x="570" y="-229" />

              <mxPoint x="570" y="-290" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-9" value="s4watr:hasPhenomenonTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-8" vertex="1" connectable="0">

        <mxCell id="73DPLS-I4gKHyQWZKQc8-9" value="saref:hasPhenomenonTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-8" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="40.75" y="-17" as="offset" />

            <mxPoint x="-2" y="-55" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-10" value="ex:PT838452" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="662.25" y="-364" width="137.75" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-11" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-7" target="73DPLS-I4gKHyQWZKQc8-13" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="245.25" y="-161" as="sourcePoint" />

            <mxPoint x="475.25" y="-161" as="targetPoint" />

            <Array as="points">

              <mxPoint x="520" y="-290" />

              <mxPoint x="520" y="-311" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-12" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-11" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="16" y="-15" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-13" value="&quot;24.5&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="662.25" y="-324" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-7" target="73DPLS-I4gKHyQWZKQc8-16" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="265.25" y="-71" as="sourcePoint" />

            <mxPoint x="495.25" y="-71" as="targetPoint" />

            <Array as="points">

              <mxPoint x="520" y="-290" />

              <mxPoint x="520" y="-241" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-15" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-14" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="41" y="-15" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-16" value="om:degreeCelsius" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="662.25" y="-254" width="130" height="25" as="geometry" />

          <mxGeometry x="662.25" y="-303" width="137.75" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-17" value="s4watr:EnvironmentalProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="313" y="-199" width="190" height="25" as="geometry" />

          <mxGeometry x="313" y="-138" width="190" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="Me7MrJQuWpTjeJUokv3z-0" target="73DPLS-I4gKHyQWZKQc8-7" edge="1">

        <mxCell id="73DPLS-I4gKHyQWZKQc8-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="Me7MrJQuWpTjeJUokv3z-0" target="73DPLS-I4gKHyQWZKQc8-7" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="100" y="-371.2499999999998" as="sourcePoint" />

            <mxPoint x="326.75" y="-469.2500000000002" as="targetPoint" />

            <Array as="points">

              <mxPoint x="199" y="-381" />

              <mxPoint x="199" y="-290" />

            </Array>

            <mxPoint x="180" y="-319.25" as="sourcePoint" />

            <mxPoint x="326.75" y="-408.2500000000002" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-19" value="saref:makesMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-18" vertex="1" connectable="0">

        <mxCell id="73DPLS-I4gKHyQWZKQc8-19" value="saref:madeExecution" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-18" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="59.20999999999999" y="-59.330000000000005" as="offset" />

            <mxPoint x="70" y="-8" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-20" value="time:Instant" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="939" y="-420" width="104.44" height="25" as="geometry" />

          <mxGeometry x="939" y="-359" width="104.44" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.25;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-10" target="73DPLS-I4gKHyQWZKQc8-23" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="808.6548275862069" y="-290.7586206896551" as="sourcePoint" />

            <mxPoint x="974" y="-351" as="targetPoint" />

            <mxPoint x="808.6548275862069" y="-229.75862068965512" as="sourcePoint" />

            <mxPoint x="974" y="-290" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-22" value="time:hasBeginning" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-21" vertex="1" connectable="0">
@@ -552,15 +487,15 @@ 
          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-23" value="ex:PT838452B" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="939" y="-395" width="104.44" height="25" as="geometry" />

          <mxGeometry x="939" y="-334" width="104.44" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-24" value="time:Instant" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="939" y="-359" width="104.44" height="25" as="geometry" />

          <mxGeometry x="939" y="-298" width="104.44" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-10" target="73DPLS-I4gKHyQWZKQc8-27" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="810.0000000000002" y="-292.7500000000002" as="sourcePoint" />

            <mxPoint x="984" y="-285.9999999999998" as="targetPoint" />

            <mxPoint x="810.0000000000002" y="-231.75000000000023" as="sourcePoint" />

            <mxPoint x="984" y="-224.99999999999977" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-26" value="time:hasEnd" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="73DPLS-I4gKHyQWZKQc8-25" vertex="1" connectable="0">
@@ -569,18 +504,18 @@ 
          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-27" value="ex:PT838452E" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="939" y="-334" width="104.44" height="25" as="geometry" />

          <mxGeometry x="939" y="-273" width="104.44" height="25" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-28" value="&quot;2020-02-06T14:00:00Z&quot; ^^xsd:dateTimeStamp" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="915.72" y="-480" width="151" height="30" as="geometry" />

          <mxGeometry x="915.72" y="-419" width="151" height="30" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-29" value="&quot;2020-02-06T14:59:59Z&quot; ^^xsd:dateTimeStamp" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="5CDmAUpphAsoas8BXQOl-1" vertex="1">

          <mxGeometry x="915.72" y="-278" width="151" height="30" as="geometry" />

          <mxGeometry x="915.72" y="-217" width="151" height="30" as="geometry" />

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-30" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" target="73DPLS-I4gKHyQWZKQc8-28" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="991" y="-420" as="sourcePoint" />

            <mxPoint x="948.9999999999998" y="-372.5" as="targetPoint" />

            <mxPoint x="991" y="-359" as="sourcePoint" />

            <mxPoint x="948.9999999999998" y="-311.5" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-32" value="time:inXSDDateTimeStamp" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="73DPLS-I4gKHyQWZKQc8-30" vertex="1" connectable="0">
@@ -590,8 +525,8 @@ 
        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.5;entryY=0;entryDx=0;entryDy=0;exitX=0.5;exitY=1;exitDx=0;exitDy=0;" parent="5CDmAUpphAsoas8BXQOl-1" source="73DPLS-I4gKHyQWZKQc8-27" target="73DPLS-I4gKHyQWZKQc8-29" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="1080.17" y="-293.83" as="sourcePoint" />

            <mxPoint x="1080.0033333333336" y="-323.9966666666666" as="targetPoint" />

            <mxPoint x="1080.17" y="-232.82999999999998" as="sourcePoint" />

            <mxPoint x="1080.0033333333336" y="-262.9966666666666" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="73DPLS-I4gKHyQWZKQc8-37" value="time:inXSDDateTimeStamp" style="text;html=1;align=center;verticalAlign=middle;resizable=0;points=[];labelBackgroundColor=#ffffff;" parent="73DPLS-I4gKHyQWZKQc8-36" vertex="1" connectable="0">
@@ -599,11 +534,111 @@ 
            <mxPoint x="79.99000000000001" y="-1.15" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-0" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="905" y="-492" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="5CDmAUpphAsoas8BXQOl-1" source="dQJhNHQzYgfLyt201jWq-10" target="dQJhNHQzYgfLyt201jWq-3">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="365" y="-508" as="sourcePoint" />

            <mxPoint x="595" y="-508" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-2" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="dQJhNHQzYgfLyt201jWq-1">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="2" y="-34" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-3" value="&quot;127&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="905" y="-526" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="5CDmAUpphAsoas8BXQOl-1" source="dQJhNHQzYgfLyt201jWq-10" target="dQJhNHQzYgfLyt201jWq-6">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="385" y="-418" as="sourcePoint" />

            <mxPoint x="615" y="-418" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-5" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="dQJhNHQzYgfLyt201jWq-4">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="-5" y="39" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-6" value="om:litre" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="905" y="-467" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-7" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="659" y="-523" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="5CDmAUpphAsoas8BXQOl-1" target="dQJhNHQzYgfLyt201jWq-10" source="hFlYh1SpmCDU3HOESGsm-2">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="630" y="-770" as="sourcePoint" />

            <mxPoint x="717" y="-672" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-9" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="dQJhNHQzYgfLyt201jWq-8">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="13" y="11" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-10" value="ex:127Litres" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="659" y="-498" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-11" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="905" y="-138" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="5CDmAUpphAsoas8BXQOl-1" source="dQJhNHQzYgfLyt201jWq-21" target="dQJhNHQzYgfLyt201jWq-14">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="365" y="-154" as="sourcePoint" />

            <mxPoint x="595" y="-154" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-13" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="dQJhNHQzYgfLyt201jWq-12">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="2" y="-34" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-14" value="&quot;24.5&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="905" y="-172" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="5CDmAUpphAsoas8BXQOl-1" source="dQJhNHQzYgfLyt201jWq-21" target="dQJhNHQzYgfLyt201jWq-17">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="385" y="-64" as="sourcePoint" />

            <mxPoint x="615" y="-64" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-16" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="dQJhNHQzYgfLyt201jWq-15">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="-5" y="39" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-17" value="om:degreeCelsius" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="905" y="-113" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-18" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="659" y="-169" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="5CDmAUpphAsoas8BXQOl-1" target="dQJhNHQzYgfLyt201jWq-21" source="73DPLS-I4gKHyQWZKQc8-7">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="540.0000000000002" y="-211.05" as="sourcePoint" />

            <mxPoint x="703" y="-113.05" as="targetPoint" />

            <Array as="points">

              <mxPoint x="570" y="-229" />

              <mxPoint x="570" y="-131" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-20" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="dQJhNHQzYgfLyt201jWq-19">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="40" y="73" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="dQJhNHQzYgfLyt201jWq-21" value="ex:245DC" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="5CDmAUpphAsoas8BXQOl-1">

          <mxGeometry x="659" y="-144" width="130" height="25" as="geometry" />

        </mxCell>

      </root>

    </mxGraphModel>

  </diagram>

  <diagram name="Tariff" id="kP6pro5My9_x4bttigvJ">

    <mxGraphModel dx="1172" dy="1493" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

    <mxGraphModel dx="1420" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

      <root>

        <mxCell id="co_7REHHcK_LofJ3KR00-0" />

        <mxCell id="co_7REHHcK_LofJ3KR00-1" parent="co_7REHHcK_LofJ3KR00-0" />
@@ -828,233 +863,259 @@ 
    </mxGraphModel>

  </diagram>

  <diagram name="Water Measurement" id="eNmwvCBus-FTKV3-pMVx">

    <mxGraphModel dx="1332" dy="1590" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="1" shadow="0">

    <mxGraphModel dx="1281" dy="1713" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="1" shadow="0">

      <root>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-0" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-1" parent="L1xtWXBFWtlWIZdAsSeQ-0" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.75;entryY=1;entryDx=0;entryDy=0;exitX=0.742;exitY=0.025;exitDx=0;exitDy=0;exitPerimeter=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-12" target="L1xtWXBFWtlWIZdAsSeQ-9" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="587" y="-504" as="sourcePoint" />

            <mxPoint x="574" y="-664" as="targetPoint" />

            <mxPoint x="460" y="-508" as="sourcePoint" />

            <mxPoint x="447" y="-668" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-3" value="saref:relatesToProperty" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-2" vertex="1" connectable="0">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-3" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-2" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="69.96" y="-17.670000000000005" as="offset" />

            <mxPoint x="47" y="-18" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryX=0.26;entryY=0.009;entryDx=0;entryDy=0;entryPerimeter=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-9" target="L1xtWXBFWtlWIZdAsSeQ-12" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="524" y="-664" as="sourcePoint" />

            <mxPoint x="502" y="-505" as="targetPoint" />

            <mxPoint x="397" y="-668" as="sourcePoint" />

            <mxPoint x="375" y="-509" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-5" value="saref:relatesToMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-4" vertex="1" connectable="0">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-5" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-4" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="-90" y="-24.17" as="offset" />

            <mxPoint x="-64" y="-24" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.75;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-10" target="L1xtWXBFWtlWIZdAsSeQ-14" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="239" y="-480.5" as="sourcePoint" />

            <mxPoint x="452" y="-480.5" as="targetPoint" />

            <mxPoint x="112" y="-484.5" as="sourcePoint" />

            <mxPoint x="325" y="-484.5" as="targetPoint" />

            <Array as="points">

              <mxPoint x="339" y="-367" />

              <mxPoint x="339" y="-459" />

              <mxPoint x="233" y="-381" />

              <mxPoint x="233" y="-466" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-7" value="saref:hasMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-6" vertex="1" connectable="0">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-7" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-6" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="62.66000000000001" y="26.33" as="offset" />

            <mxPoint x="61" y="18" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-9" value="s4watr:Cadmium" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="460" y="-615" width="170" height="25" as="geometry" />

          <mxGeometry x="333" y="-605" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-10" value="ex:DTSample335632" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="170" y="-379" width="150" height="25" as="geometry" />

          <mxGeometry x="43" y="-394" width="150" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-11" value="s4watr:Water" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=top;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="170" y="-403" width="150" height="25" as="geometry" />

          <mxGeometry x="43" y="-418" width="150" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-12" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="456.75" y="-503" width="176" height="25" as="geometry" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-12" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="329.75" y="-510" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-13" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="796.75" y="-460" width="141" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-14" value="ex:DTSMeasurement106" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="456.75" y="-478" width="176" height="25" as="geometry" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-14" value="ex:DTSObservation106" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="329.75" y="-485" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-14" target="L1xtWXBFWtlWIZdAsSeQ-17" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="382" y="-376" as="sourcePoint" />

            <mxPoint x="612" y="-376" as="targetPoint" />

            <mxPoint x="255" y="-380" as="sourcePoint" />

            <mxPoint x="485" y="-380" as="targetPoint" />

            <Array as="points">

              <mxPoint x="660" y="-465" />

              <mxPoint x="660" y="-524" />

              <mxPoint x="533" y="-472" />

              <mxPoint x="533" y="-517" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-16" value="saref:hasTimestamp" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-15" vertex="1" connectable="0">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-16" value="saref:hasResultTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-15" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="54.5" y="-17" as="offset" />

            <mxPoint x="44" y="-17" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-17" value="&quot;2020-02-06T21:01:10&quot; ^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="799" y="-539" width="151" height="30" as="geometry" />

          <mxGeometry x="672" y="-532" width="151" height="30" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-24" value="s4watr:ChemicalProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="333" y="-630" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-18" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-14" target="L1xtWXBFWtlWIZdAsSeQ-20" edge="1">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.722;entryY=0.017;entryDx=0;entryDy=0;exitX=0.714;exitY=1.001;exitDx=0;exitDy=0;exitPerimeter=0;entryPerimeter=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-32" target="L1xtWXBFWtlWIZdAsSeQ-42" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="382" y="-336" as="sourcePoint" />

            <mxPoint x="612" y="-336" as="targetPoint" />

            <Array as="points">

              <mxPoint x="660" y="-465" />

              <mxPoint x="660" y="-487" />

            </Array>

            <mxPoint x="463.25" y="-313" as="sourcePoint" />

            <mxPoint x="450.25" y="-473" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-19" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-18" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="16" y="-15" as="offset" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-26" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-25" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="53" y="14" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-20" value="&quot;0.005&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="799" y="-499" width="130" height="25" as="geometry" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.226;exitY=0.017;exitDx=0;exitDy=0;entryX=0.236;entryY=1.032;entryDx=0;entryDy=0;exitPerimeter=0;entryPerimeter=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-42" target="L1xtWXBFWtlWIZdAsSeQ-32" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="400.25" y="-473" as="sourcePoint" />

            <mxPoint x="378.25" y="-314" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-21" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-14" target="L1xtWXBFWtlWIZdAsSeQ-23" edge="1">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-28" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-27" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="-64" y="20" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-29" value="s4watr:EscherichiaColi" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="336" y="-183" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-30" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="333" y="-328" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-32" value="ex:DTSObservation107" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="333" y="-303" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-32" target="L1xtWXBFWtlWIZdAsSeQ-35" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="402" y="-246" as="sourcePoint" />

            <mxPoint x="632" y="-246" as="targetPoint" />

            <mxPoint x="258.25" y="-185" as="sourcePoint" />

            <mxPoint x="643" y="-318" as="targetPoint" />

            <Array as="points">

              <mxPoint x="660" y="-466" />

              <mxPoint x="660" y="-422" />

              <mxPoint x="533" y="-290" />

              <mxPoint x="533" y="-333" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-22" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-21" vertex="1" connectable="0">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-34" value="saref:hasResultTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-33" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="41" y="-15" as="offset" />

            <mxPoint x="46" y="-15" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-23" value="om:microgramPerLitre" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="796.75" y="-435" width="141" height="25" as="geometry" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-35" value="&quot;2020-02-06T21:01:30&quot; ^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="672" y="-348" width="147.75" height="30" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-24" value="s4watr:ChemicalProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="460" y="-640" width="170" height="25" as="geometry" />

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-42" value="s4watr:BacterialProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="336" y="-208" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.722;entryY=0.017;entryDx=0;entryDy=0;exitX=0.714;exitY=1.001;exitDx=0;exitDy=0;exitPerimeter=0;entryPerimeter=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-32" target="L1xtWXBFWtlWIZdAsSeQ-42" edge="1">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-43" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-10" target="L1xtWXBFWtlWIZdAsSeQ-32" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="590.25" y="-309" as="sourcePoint" />

            <mxPoint x="577.25" y="-469" as="targetPoint" />

            <mxPoint x="113" y="-355.2499999999998" as="sourcePoint" />

            <mxPoint x="339.75" y="-453.2500000000002" as="targetPoint" />

            <Array as="points">

              <mxPoint x="233" y="-381" />

              <mxPoint x="233" y="-290" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-26" value="saref:relatesToProperty" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-25" vertex="1" connectable="0">

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-44" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-43" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="77.32" y="14.009999999999994" as="offset" />

            <mxPoint x="62" y="-55" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-27" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.226;exitY=0.017;exitDx=0;exitDy=0;entryX=0.236;entryY=1.032;entryDx=0;entryDy=0;exitPerimeter=0;entryPerimeter=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-42" target="L1xtWXBFWtlWIZdAsSeQ-32" edge="1">

        <mxCell id="V-0L58M4isHO7IBib7Te-0" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="918" y="-433" width="138" height="25" as="geometry" />

        </mxCell>

        <mxCell id="V-0L58M4isHO7IBib7Te-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="V-0L58M4isHO7IBib7Te-10" target="V-0L58M4isHO7IBib7Te-3">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="527.25" y="-469" as="sourcePoint" />

            <mxPoint x="505.25" y="-310" as="targetPoint" />

            <mxPoint x="378" y="-449" as="sourcePoint" />

            <mxPoint x="608" y="-449" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-28" value="saref:relatesToMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-27" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="-90" y="20.950000000000003" as="offset" />

        <mxCell id="V-0L58M4isHO7IBib7Te-2" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="V-0L58M4isHO7IBib7Te-1">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="2" y="-34" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-29" value="s4watr:EscherichiaColi" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="463" y="-154" width="170" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-3" value="&quot;0.005&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="918" y="-467" width="115" height="25" as="geometry" />

        </mxCell>

        <mxCell id="V-0L58M4isHO7IBib7Te-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="V-0L58M4isHO7IBib7Te-10" target="V-0L58M4isHO7IBib7Te-6">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="398" y="-359" as="sourcePoint" />

            <mxPoint x="628" y="-359" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-30" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="460" y="-308" width="176" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-5" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="V-0L58M4isHO7IBib7Te-4">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="-5" y="38" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-31" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="802.25" y="-270" width="207.75" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-6" value="om:microgramPerLitre" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="918" y="-408" width="138" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-32" value="ex:DTSMeasurement107" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="460" y="-283" width="176" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-7" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="672" y="-464" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-33" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-32" target="L1xtWXBFWtlWIZdAsSeQ-35" edge="1">

        <mxCell id="V-0L58M4isHO7IBib7Te-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="L1xtWXBFWtlWIZdAsSeQ-1" target="V-0L58M4isHO7IBib7Te-10" source="L1xtWXBFWtlWIZdAsSeQ-14">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="385.25" y="-181" as="sourcePoint" />

            <mxPoint x="770" y="-314" as="targetPoint" />

            <mxPoint x="533" y="-687" as="sourcePoint" />

            <mxPoint x="757" y="-874" as="targetPoint" />

            <Array as="points">

              <mxPoint x="660" y="-270" />

              <mxPoint x="660" y="-329" />

              <mxPoint x="533" y="-472" />

              <mxPoint x="533" y="-426" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-34" value="saref:hasTimestamp" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-33" vertex="1" connectable="0">

        <mxCell id="V-0L58M4isHO7IBib7Te-9" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="V-0L58M4isHO7IBib7Te-8">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="50" y="-15" as="offset" />

            <mxPoint x="31" y="-16" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-35" value="&quot;2020-02-06T21:01:30&quot; ^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="802.25" y="-344" width="147.75" height="30" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-10" value="ex:0005MGPL" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="672" y="-439" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="V-0L58M4isHO7IBib7Te-11" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="918" y="-253" width="208" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-36" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-32" target="L1xtWXBFWtlWIZdAsSeQ-38" edge="1">

        <mxCell id="V-0L58M4isHO7IBib7Te-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="V-0L58M4isHO7IBib7Te-21" target="V-0L58M4isHO7IBib7Te-14">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="385.25" y="-141" as="sourcePoint" />

            <mxPoint x="615.25" y="-141" as="targetPoint" />

            <Array as="points">

              <mxPoint x="660" y="-270" />

              <mxPoint x="660" y="-291" />

            </Array>

            <mxPoint x="378" y="-269" as="sourcePoint" />

            <mxPoint x="608" y="-269" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-37" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-36" vertex="1" connectable="0">

        <mxCell id="V-0L58M4isHO7IBib7Te-13" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="V-0L58M4isHO7IBib7Te-12">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="16" y="-15" as="offset" />

            <mxPoint x="2" y="-34" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-38" value="&quot;0.42&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="802.25" y="-304" width="130" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-14" value="&quot;0.42&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="918" y="-287" width="108" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-39" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-32" target="L1xtWXBFWtlWIZdAsSeQ-41" edge="1">

        <mxCell id="V-0L58M4isHO7IBib7Te-15" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="V-0L58M4isHO7IBib7Te-21" target="V-0L58M4isHO7IBib7Te-17">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="405.25" y="-51" as="sourcePoint" />

            <mxPoint x="635.25" y="-51" as="targetPoint" />

            <Array as="points">

              <mxPoint x="660" y="-270" />

              <mxPoint x="660" y="-233" />

            </Array>

            <mxPoint x="398" y="-179" as="sourcePoint" />

            <mxPoint x="628" y="-179" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-40" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-39" vertex="1" connectable="0">

        <mxCell id="V-0L58M4isHO7IBib7Te-16" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="V-0L58M4isHO7IBib7Te-15">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="41" y="-15" as="offset" />

            <mxPoint x="-5" y="39" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-41" value="om:colonyFormingUnitPerMillilitre" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="802.25" y="-245" width="207.75" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-17" value="om:colonyFormingUnitPerMillilitre" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="918" y="-228" width="208" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-42" value="s4watr:BacterialProperty" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="L1xtWXBFWtlWIZdAsSeQ-1" vertex="1">

          <mxGeometry x="463" y="-179" width="170" height="25" as="geometry" />

        <mxCell id="V-0L58M4isHO7IBib7Te-18" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="672" y="-284" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-43" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.75;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="L1xtWXBFWtlWIZdAsSeQ-1" source="L1xtWXBFWtlWIZdAsSeQ-10" target="L1xtWXBFWtlWIZdAsSeQ-32" edge="1">

        <mxCell id="V-0L58M4isHO7IBib7Te-19" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" parent="L1xtWXBFWtlWIZdAsSeQ-1" target="V-0L58M4isHO7IBib7Te-21" source="L1xtWXBFWtlWIZdAsSeQ-32">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="240" y="-351.2499999999998" as="sourcePoint" />

            <mxPoint x="466.75" y="-449.2500000000002" as="targetPoint" />

            <mxPoint x="513" y="-274" as="sourcePoint" />

            <mxPoint x="824" y="-592" as="targetPoint" />

            <Array as="points">

              <mxPoint x="339" y="-361" />

              <mxPoint x="339" y="-270" />

              <mxPoint x="533" y="-290" />

              <mxPoint x="533" y="-246" />

            </Array>

          </mxGeometry>

        </mxCell>

        <mxCell id="L1xtWXBFWtlWIZdAsSeQ-44" value="saref:hasMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="L1xtWXBFWtlWIZdAsSeQ-43" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="59.20999999999999" y="-59.330000000000005" as="offset" />

        <mxCell id="V-0L58M4isHO7IBib7Te-20" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="V-0L58M4isHO7IBib7Te-19">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="27" y="-16" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="V-0L58M4isHO7IBib7Te-21" value="ex:042CFUPM" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="L1xtWXBFWtlWIZdAsSeQ-1">

          <mxGeometry x="672" y="-259" width="130" height="25" as="geometry" />

        </mxCell>

      </root>

    </mxGraphModel>

  </diagram>

  <diagram name="Water Infrastructure" id="I0msWqChcBSyuUZzWnv5">

    <mxGraphModel dx="1420" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

    <mxGraphModel dx="1675" dy="1985" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

      <root>

        <mxCell id="reOeOsAvmUQr0PY2YttW-0" />

        <mxCell id="reOeOsAvmUQr0PY2YttW-1" parent="reOeOsAvmUQr0PY2YttW-0" />
@@ -1071,7 +1132,7 @@ 
        <mxCell id="reOeOsAvmUQr0PY2YttW-24" value="s4watr:DistributionSystem" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="135.25" y="-562" width="162.5" height="25" as="geometry" />

        </mxCell>

        <mxCell id="reOeOsAvmUQr0PY2YttW-30" value="s4watr:Water" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

        <mxCell id="reOeOsAvmUQr0PY2YttW-30" value="s4watr:WaterKind" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="34" y="-690" width="132.5" height="25" as="geometry" />

        </mxCell>

        <mxCell id="reOeOsAvmUQr0PY2YttW-31" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="reOeOsAvmUQr0PY2YttW-67" target="Ip9XLcEBRLrAxs-8_-Sa-4" edge="1">
@@ -1260,21 +1321,18 @@ 
        <mxCell id="2pppwFLjnw0cuP2dWcX--1" value="s4watr:FlowRate" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="824.48" y="-349.5" width="170" height="25" as="geometry" />

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-4" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-4" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="445" y="-374.5" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-5" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="664.25" y="-212.5" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-6" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=1;exitY=0.75;exitDx=0;exitDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="EONONQ0r8S7dTxEkRtJ8-16" target="2pppwFLjnw0cuP2dWcX--1" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="1116.0379999999998" y="-101.5" as="sourcePoint" />

            <mxPoint x="1116.4799999999998" y="-99.5" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-7" value="saref:relatesToProperty" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-6" vertex="1" connectable="0">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-7" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-6" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="-44.00000000000001" y="7.25" as="offset" />

            <mxPoint x="-66" y="7" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=1;entryY=0.25;entryDx=0;entryDy=0;exitX=0;exitY=0.25;exitDx=0;exitDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="2pppwFLjnw0cuP2dWcX--1" target="EONONQ0r8S7dTxEkRtJ8-16" edge="1">
@@ -1283,9 +1341,9 @@ 
            <mxPoint x="1057.9579999999999" y="-101" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-9" value="saref:relatesToMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-8" vertex="1" connectable="0">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-9" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-8" vertex="1" connectable="0">

          <mxGeometry x="0.0408" relative="1" as="geometry">

            <mxPoint x="17.520000000000007" y="-13.25" as="offset" />

            <mxPoint x="42" y="-13" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-12" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.633;exitY=0.007;exitDx=0;exitDy=0;exitPerimeter=0;entryX=0.723;entryY=1.015;entryDx=0;entryDy=0;entryPerimeter=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="EONONQ0r8S7dTxEkRtJ8-4" target="Ygj3Fn95lDl5xOJp6P82-2" edge="1">
@@ -1294,9 +1352,9 @@ 
            <mxPoint x="559" y="-431.5" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-13" value="saref:isMeasurementOf" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-12" vertex="1" connectable="0">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-13" value="saref:observes" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-12" vertex="1" connectable="0">

          <mxGeometry x="-0.262" y="-1" relative="1" as="geometry">

            <mxPoint x="73.77000000000001" y="3.999999999999999" as="offset" />

            <mxPoint x="48" y="4" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-14" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.337;entryY=0.027;entryDx=0;entryDy=0;exitX=0.25;exitY=1;exitDx=0;exitDy=0;entryPerimeter=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="Ygj3Fn95lDl5xOJp6P82-2" target="EONONQ0r8S7dTxEkRtJ8-4" edge="1">
@@ -1305,12 +1363,12 @@ 
            <mxPoint x="372.7857142857142" y="13.5" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-15" value="saref:hasMeasurement" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-14" vertex="1" connectable="0">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-15" value="saref:isObservedBy" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontColor=#000000;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-14" vertex="1" connectable="0">

          <mxGeometry x="0.1333" y="-3" relative="1" as="geometry">

            <mxPoint x="-68.19" y="-18.85" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-16" value="ex:PMeasurement854306" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-16" value="ex:PObservation854306" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="445" y="-349.5" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-17" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="EONONQ0r8S7dTxEkRtJ8-16" target="EONONQ0r8S7dTxEkRtJ8-19" edge="1">
@@ -1319,7 +1377,7 @@ 
            <mxPoint x="600.25" y="-247.5" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-18" value="saref:hasTimestamp" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-17" vertex="1" connectable="0">

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-18" value="saref:hasResultTime" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-17" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="35.35" y="-17.05" as="offset" />

          </mxGeometry>
@@ -1327,56 +1385,76 @@ 
        <mxCell id="EONONQ0r8S7dTxEkRtJ8-19" value="&quot;2020-02-06T13:48:22&quot; ^^xsd:dateTime" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="664.25" y="-284.5" width="141" height="30" as="geometry" />

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-20" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="EONONQ0r8S7dTxEkRtJ8-16" target="EONONQ0r8S7dTxEkRtJ8-22" edge="1">

        <mxCell id="PDecacJyymWXdxU_ss_S-0" value="s4watr:WaterUse" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="191.11" y="-690" width="132.5" height="25" as="geometry" />

        </mxCell>

        <mxCell id="PDecacJyymWXdxU_ss_S-1" value="s4watr:Domestic" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="191.11" y="-665" width="132.5" height="25" as="geometry" />

        </mxCell>

        <mxCell id="PDecacJyymWXdxU_ss_S-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.75;exitY=0;exitDx=0;exitDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="reOeOsAvmUQr0PY2YttW-24" target="PDecacJyymWXdxU_ss_S-1" edge="1">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="370.25" y="-207.5" as="sourcePoint" />

            <mxPoint x="600.25" y="-207.5" as="targetPoint" />

            <mxPoint x="226.5000000000001" y="-552" as="sourcePoint" />

            <mxPoint x="226.49000000000012" y="-652.5" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-21" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-20" vertex="1" connectable="0">

        <mxCell id="PDecacJyymWXdxU_ss_S-3" value="s4watr:isIntendedFor" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="PDecacJyymWXdxU_ss_S-2" vertex="1" connectable="0">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="39.78" y="-14.7" as="offset" />

            <mxPoint x="-68" y="20.5" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-22" value="&quot;8.3&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="664.25" y="-244.5" width="130" height="25" as="geometry" />

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-0" value="saref:UnitOfMeasure" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="reOeOsAvmUQr0PY2YttW-1">

          <mxGeometry x="856.48" y="-204" width="138" height="25" as="geometry" />

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-25" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="EONONQ0r8S7dTxEkRtJ8-16" target="EONONQ0r8S7dTxEkRtJ8-27" edge="1">

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-1" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="reOeOsAvmUQr0PY2YttW-1" source="Cvp9qdVpZC2IQNV6lqiE-10" target="Cvp9qdVpZC2IQNV6lqiE-3">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="390.25" y="-117.5" as="sourcePoint" />

            <mxPoint x="620.25" y="-117.5" as="targetPoint" />

            <mxPoint x="316.48" y="-220" as="sourcePoint" />

            <mxPoint x="546.48" y="-220" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-26" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="EONONQ0r8S7dTxEkRtJ8-25" vertex="1" connectable="0">

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-2" value="saref:hasValue" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="Cvp9qdVpZC2IQNV6lqiE-1">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="63.59" y="14.64" as="offset" />

            <mxPoint x="2" y="-34" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="EONONQ0r8S7dTxEkRtJ8-27" value="om:litrePerHour" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="664.25" y="-187.5" width="130" height="25" as="geometry" />

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-3" value="&quot;8.3&quot;^^xsd:float" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="reOeOsAvmUQr0PY2YttW-1">

          <mxGeometry x="856.48" y="-238" width="115" height="25" as="geometry" />

        </mxCell>

        <mxCell id="PDecacJyymWXdxU_ss_S-0" value="s4watr:WaterUse" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#dae8fc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="191.11" y="-690" width="132.5" height="25" as="geometry" />

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-4" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="reOeOsAvmUQr0PY2YttW-1" source="Cvp9qdVpZC2IQNV6lqiE-10" target="Cvp9qdVpZC2IQNV6lqiE-6">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="336.48" y="-130" as="sourcePoint" />

            <mxPoint x="566.48" y="-130" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="PDecacJyymWXdxU_ss_S-1" value="s4watr:Domestic" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" parent="reOeOsAvmUQr0PY2YttW-1" vertex="1">

          <mxGeometry x="191.11" y="-665" width="132.5" height="25" as="geometry" />

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-5" value="saref:isMeasuredIn" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="Cvp9qdVpZC2IQNV6lqiE-4">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="-5" y="38" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="PDecacJyymWXdxU_ss_S-2" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.75;exitY=0;exitDx=0;exitDy=0;" parent="reOeOsAvmUQr0PY2YttW-1" source="reOeOsAvmUQr0PY2YttW-24" target="PDecacJyymWXdxU_ss_S-1" edge="1">

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-6" value="om:litrePerHour" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="reOeOsAvmUQr0PY2YttW-1">

          <mxGeometry x="856.48" y="-179" width="138" height="25" as="geometry" />

        </mxCell>

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-7" value="saref:PropertyValue" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" vertex="1" parent="reOeOsAvmUQr0PY2YttW-1">

          <mxGeometry x="610.48" y="-235" width="130" height="25" as="geometry" />

        </mxCell>

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" parent="reOeOsAvmUQr0PY2YttW-1" target="Cvp9qdVpZC2IQNV6lqiE-10" source="EONONQ0r8S7dTxEkRtJ8-16">

          <mxGeometry relative="1" as="geometry">

            <mxPoint x="226.5000000000001" y="-552" as="sourcePoint" />

            <mxPoint x="226.49000000000012" y="-652.5" as="targetPoint" />

            <mxPoint x="459.75" y="-120" as="sourcePoint" />

            <mxPoint x="710.75" y="-522" as="targetPoint" />

          </mxGeometry>

        </mxCell>

        <mxCell id="PDecacJyymWXdxU_ss_S-3" value="s4watr:isIntendedFor" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" parent="PDecacJyymWXdxU_ss_S-2" vertex="1" connectable="0">

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-9" value="saref:hasResult" style="text;html=1;resizable=0;points=[];align=center;verticalAlign=middle;labelBackgroundColor=#ffffff;fontSize=13;" vertex="1" connectable="0" parent="Cvp9qdVpZC2IQNV6lqiE-8">

          <mxGeometry x="-0.1295" y="-2" relative="1" as="geometry">

            <mxPoint x="-68" y="20.5" as="offset" />

            <mxPoint x="23" y="51" as="offset" />

          </mxGeometry>

        </mxCell>

        <mxCell id="Cvp9qdVpZC2IQNV6lqiE-10" value="ex:83LPH" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;" vertex="1" parent="reOeOsAvmUQr0PY2YttW-1">

          <mxGeometry x="610.48" y="-210" width="130" height="25" as="geometry" />

        </mxCell>

      </root>

    </mxGraphModel>

  </diagram>

  <diagram name="KPIs" id="2dTqfHXTZI1hAFpbBjs6">

    <mxGraphModel dx="1420" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

    <mxGraphModel dx="1089" dy="1580" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="1169" pageHeight="827" math="0" shadow="0">

      <root>

        <mxCell id="XtonGxu_BJ7S8RXWlJSi-0" />

        <mxCell id="XtonGxu_BJ7S8RXWlJSi-1" parent="XtonGxu_BJ7S8RXWlJSi-0" />
@@ -1611,22 +1689,22 @@ 
        <mxCell id="doLmy8q2egU5B1rHH6pF-20" value="dbpedia:Madrid" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=top;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="462.7" y="-595.5" width="105.5" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-0" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

        <mxCell id="S04NJNn03lTwGMdM--P5-0" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="673.74" y="-690" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-1" value="ex:PLMeasurement56206" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

        <mxCell id="S04NJNn03lTwGMdM--P5-1" value="ex:PLObservation56206" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="673.74" y="-665" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-2" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

        <mxCell id="S04NJNn03lTwGMdM--P5-2" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="673.74" y="-631" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-3" value="ex:PLMeasurement56207" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

        <mxCell id="S04NJNn03lTwGMdM--P5-3" value="ex:PLObservation56207" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="673.74" y="-606" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-4" value="saref:Measurement" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

        <mxCell id="S04NJNn03lTwGMdM--P5-4" value="saref:Observation" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;strokeColor=#000000;fillColor=#fff2cc;fontStyle=0;fontSize=13;verticalAlign=middle;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="673.74" y="-570.5" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-5" value="ex:PLMeasurement56208" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

        <mxCell id="S04NJNn03lTwGMdM--P5-5" value="ex:PLObservation56208" style="rounded=0;whiteSpace=wrap;html=1;strokeWidth=1;fontStyle=4;fontSize=13;verticalAlign=middle;align=center;spacingLeft=2;" parent="XtonGxu_BJ7S8RXWlJSi-1" vertex="1">

          <mxGeometry x="673.74" y="-545.5" width="176" height="25" as="geometry" />

        </mxCell>

        <mxCell id="S04NJNn03lTwGMdM--P5-8" style="edgeStyle=orthogonalEdgeStyle;rounded=0;html=1;jettySize=auto;orthogonalLoop=1;strokeWidth=1;fontStyle=0;fontSize=13;verticalAlign=middle;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=0.913;exitY=0.017;exitDx=0;exitDy=0;exitPerimeter=0;" parent="XtonGxu_BJ7S8RXWlJSi-1" source="XtonGxu_BJ7S8RXWlJSi-4" target="S04NJNn03lTwGMdM--P5-10" edge="1">

diagrams/SAREF4WATR figures.drawio

+101 −113

File changed.

Preview size limit exceeded, changes collapsed.

documentation/examples.html

+1 −1
Changes for documentation/examples.html: 1 added line, 1 removed line.
Original line number Diff line number Diff line 
<p>The example presented in <a href="#Figure_13">Figure 13</a> depicts a water meter (ex:Meter4837QW123). It can be described by a set of static properties either reused from SAREF (e.g., <a href="https://saref.etsi.org/core/hasModel">saref:hasModel</a>) or from SAREF4WATR (e.g., <a href="https://saref.etsi.org/saref4watr/hasFirmwareVersion">s4watr:hasFirmwareVersion</a>). The spatial extent of the meter is described by its geometry (ex:MeterGeom) that is represented as a point in space following its WKT representation. SAREF4WATR defines different measurable properties of a water meter, among them the battery remaining time (<a href="https://saref.etsi.org/saref4watr/BatteryRemainingTime">s4watr:BatteryRemainingTime</a>) that is the one used in the example. Observations of the meter for this property can be represented (ex:WMObservation200206) using for example the time instant of the observation, its value and the unit of measure.</p>

<p>The example presented in <a href="#Figure_13">Figure 13</a> depicts a water meter (ex:Meter4837QW123). It can be described by a set of static properties either reused from SAREF (e.g., <a href="https://saref.etsi.org/core/hasModel">saref:hasModel</a>) or from SAREF4WATR (e.g., <a href="https://saref.etsi.org/saref4watr/hasFirmwareVersion">s4watr:hasFirmwareVersion</a>). The spatial extent of the meter is described by its geometry (ex:MeterGeom) that is represented as a point in space following its WKT representation. SAREF4WATR defines different measurable properties of a water meter, among them the battery remaining time (<a href="https://saref.etsi.org/saref4watr/BatteryRemainingTime">s4watr:BatteryRemainingTime</a>) that is the one used in the example. Observations of the meter for this property can be represented (ex:WMObservation200206) using for example the time instant of the observation and its value and the unit of measure in a property value.</p>



<figure>

  <a href="diagrams/SAREF4WATR Example water meter.png"><img src="diagrams/SAREF4WATR Example water meter.png" alt="Example of water meter"/></a>

examples/KPI.ttl

+12 −12
Changes for examples/KPI.ttl: 12 added lines, 12 removed lines.
Original line number Diff line number Diff line
@@ -99,9 +99,9 @@ ex:DowntownDS rdf:type owl:NamedIndividual , 
ex:MPL2020020723 rdf:type owl:NamedIndividual ,

                          s4city:KeyPerformanceIndicatorAssessment ;

                 s4city:assesses ex:DowntownDS ;

                 s4city:isDerivedFrom ex:PLMeasurement56206 ,

                                      ex:PLMeasurement56207 ,

                                      ex:PLMeasurement56208 ;

                 s4city:isDerivedFrom ex:PLObservation56206 ,

                                      ex:PLObservation56207 ,

                                      ex:PLObservation56208 ;

                 s4city:quantifiesKPI ex:MinimumPressureLevel ;

                 s4city:refersToFeature dbpedia:Madrid ;

                 s4city:refersToTime ex:MPL37222 ;
@@ -145,16 +145,16 @@ ex:OneWeek rdf:type owl:NamedIndividual , 
           time:numericDuration 1 .





###  https://saref.etsi.org/saref4watr/example/PLMeasurement56206

ex:PLMeasurement56206 rdf:type owl:NamedIndividual ,

                               saref:Measurement .

###  https://saref.etsi.org/saref4watr/example/PLObservation56206

ex:PLObservation56206 rdf:type owl:NamedIndividual ,

                               saref:Observation .





###  https://saref.etsi.org/saref4watr/example/PLMeasurement56207

ex:PLMeasurement56207 rdf:type owl:NamedIndividual ,

                               saref:Measurement .

###  https://saref.etsi.org/saref4watr/example/PLObservation56207

ex:PLObservation56207 rdf:type owl:NamedIndividual ,

                               saref:Observation .





###  https://saref.etsi.org/saref4watr/example/PLMeasurement56208

ex:PLMeasurement56208 rdf:type owl:NamedIndividual ,

                               saref:Measurement .
 
###  https://saref.etsi.org/saref4watr/example/PLObservation56208

ex:PLObservation56208 rdf:type owl:NamedIndividual ,

                               saref:Observation .

examples/MeterMeasurement.ttl

+28 −18
Changes for examples/MeterMeasurement.ttl: 28 added lines, 18 removed lines.
Original line number Diff line number Diff line 
@prefix om: <http://www.ontology-of-units-of-measure.org/resource/om-2/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/MeterMeasurement/> .

@prefix ex: <https://saref.etsi.org/saref4watr/v2.1.1/example/MeterObservation/> .

@prefix owl: <http://www.w3.org/2002/07/owl#> .

@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .

@prefix xsd: <http://www.w3.org/2001/XMLSchema#> .
@@ -13,11 +13,11 @@ 
@prefix dctype: <http://purl.org/dc/dcmitype/> .

@prefix dcterms: <http://purl.org/dc/terms/> .



<https://saref.etsi.org/saref4watr/v2.1.1/example/MeterMeasurement#> a dctype:Dataset ;

<https://saref.etsi.org/saref4watr/v1.1.1/example/MeterObservation#> a dctype:Dataset ;

  dcterms:license <https://forge.etsi.org/etsi-software-license> ;

  dcterms:conformsTo <https://saref.etsi.org/saref4watr/v2.1.1/> ;

  dcterms:title "Example MeterMeasurement"@en ;

  dcterms:description "Example MeterMeasurement"@en .

  dcterms:title "Example Meter Observation"@en ;

  dcterms:description "Example Meter Observation"@en .

  



#################################################################
@@ -57,22 +57,22 @@ om:litre rdf:type owl:NamedIndividual , 
###  https://saref.etsi.org/saref4watr/ExternalTemperature

s4watr:ExternalTemperature rdf:type owl:NamedIndividual ,

                                    s4watr:WaterFlowProperty ;

                           saref:relatesToMeasurement ex:WFMeasurement643234 ;

                           saref:isObservedBy ex:WFObservation643234 ;

                           rdfs:label "External temperature"@en .





###  https://saref.etsi.org/saref4watr/FlowVolume

s4watr:FlowVolume rdf:type owl:NamedIndividual ,

                           s4watr:WaterFlowProperty ;

                  saref:relatesToMeasurement ex:WFMeasurement170206 ;

                  saref:isObservedBy ex:WFObservation170206 ;

                  rdfs:label "Flow volume"@en .





###  https://saref.etsi.org/saref4watr/example/Meter4837QW123

ex:Meter4837QW123 rdf:type owl:NamedIndividual ,

                           s4watr:WaterMeter ;

                  saref:makesMeasurement ex:WFMeasurement170206 ,

                                         ex:WFMeasurement643234 .

                  saref:madeExecution ex:WFObservation170206 ,

                                      ex:WFObservation643234 .





###  https://saref.etsi.org/saref4watr/example/PT838452
@@ -94,19 +94,29 @@ ex:PT838452E rdf:type owl:NamedIndividual , 
             time:inXSDDateTimeStamp "2020-02-06T14:59:59Z"^^xsd:dateTimeStamp .





###  https://saref.etsi.org/saref4watr/example/WFMeasurement170206

ex:WFMeasurement170206 rdf:type owl:NamedIndividual ,

                                saref:Measurement ;

                       saref:isMeasuredIn om:litre ;

                       saref:relatesToProperty s4watr:FlowVolume ;

###  https://saref.etsi.org/saref4watr/example/WFObservation170206

ex:WFObservation170206 rdf:type owl:NamedIndividual ,

                                saref:Observation ;

                       saref:observes s4watr:FlowVolume ;

                       saref:hasResultTime "2020-02-06T15:07:12"^^xsd:dateTime ;

                       saref:hasResult ex:127Litres .





###  http://saref.etsi.org/saref4watr/example/127Litres

ex:127Litres rdf:type saref:PropertyValue ;

             saref:isMeasuredIn om:litre ;

             saref:hasValue "127.0"^^xsd:float .





###  https://saref.etsi.org/saref4watr/example/WFMeasurement643234

ex:WFMeasurement643234 rdf:type owl:NamedIndividual ,

                                saref:Measurement ;

                       saref:isMeasuredIn om:degreeCelsius ;

                       saref:relatesToProperty s4watr:ExternalTemperature ;

###  https://saref.etsi.org/saref4watr/example/WFObservation643234

ex:WFObservation643234 rdf:type owl:NamedIndividual ,

                                saref:Observation ;

                       saref:observes s4watr:ExternalTemperature ;

                       saref:hasPhenomenonTime ex:PT838452 ;

                       saref:hasResult ex:245DC .





###  http://saref.etsi.org/saref4watr/example/245DC

ex:245DC rdf:type saref:PropertyValue ;

         saref:isMeasuredIn om:degreeCelsius ;

         saref:hasValue "24.5"^^xsd:float .