data.posccaesar.org / npd

Go to a project
Toggle navigation Toggle navigation pinning
David Price
025a1db3 1 parent 20876e50

First bit of fix after rework of MPRG transform last week.

Inline Side-by-side
Showing 2 changed files with 19 additions and 232 deletions
...@@ -708,9 +708,6 @@ mpr-tables:GasSales ...@@ -708,9 +708,6 @@ mpr-tables:GasSales
708 rdfs:subClassOf rhspin:MPRGTableTemplates ; 708 rdfs:subClassOf rhspin:MPRGTableTemplates ;
709 spin:body 709 spin:body
710 [ rdf:type sp:Select ; 710 [ rdf:type sp:Select ;
711 - sp:orderBy ([ sp:varName "facilityName"^^xsd:string
712 - ] [ sp:varName "purposeTypeName"^^xsd:string
713 - ]) ;
714 sp:resultVariables ([ sp:varName "facilityName"^^xsd:string 711 sp:resultVariables ([ sp:varName "facilityName"^^xsd:string
715 ] [ sp:varName "purposeTypeName"^^xsd:string 712 ] [ sp:varName "purposeTypeName"^^xsd:string
716 ] [ sp:varName "materialTypeName"^^xsd:string 713 ] [ sp:varName "materialTypeName"^^xsd:string
...@@ -740,23 +737,23 @@ mpr-tables:GasSales ...@@ -740,23 +737,23 @@ mpr-tables:GasSales
740 [ sp:varName "productVolumeReport"^^xsd:string 737 [ sp:varName "productVolumeReport"^^xsd:string
741 ] 738 ]
742 ] [ sp:object 739 ] [ sp:object
743 - [ sp:varName "productionFlowsInReportingPeriod"^^xsd:string 740 + [ sp:varName "productionFlowNetwork"^^xsd:string
744 ] ; 741 ] ;
745 sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ; 742 sp:predicate <http://www.reportinghub.no/ep/schema/report#reportOn> ;
746 sp:subject 743 sp:subject
747 [ sp:varName "productVolumeReport"^^xsd:string 744 [ sp:varName "productVolumeReport"^^xsd:string
748 ] 745 ]
749 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ; 746 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlowNetwork> ;
750 sp:predicate rdf:type ; 747 sp:predicate rdf:type ;
751 sp:subject 748 sp:subject
752 - [ sp:varName "productionFlowsInReportingPeriod"^^xsd:string 749 + [ sp:varName "productionFlowNetwork"^^xsd:string
753 ] 750 ]
754 ] [ sp:object 751 ] [ sp:object
755 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string 752 [ sp:varName "productionFlowInReportingPeriod"^^xsd:string
756 ] ; 753 ] ;
757 - sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ; 754 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasNetworkPart> ;
758 sp:subject 755 sp:subject
759 - [ sp:varName "productionFlowsInReportingPeriod"^^xsd:string 756 + [ sp:varName "productionFlowNetwork"^^xsd:string
760 ] 757 ]
761 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ; 758 ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductionFlow> ;
762 sp:predicate rdf:type ; 759 sp:predicate rdf:type ;
...@@ -781,13 +778,6 @@ mpr-tables:GasSales ...@@ -781,13 +778,6 @@ mpr-tables:GasSales
781 [ sp:varName "productionFlowWhole"^^xsd:string 778 [ sp:varName "productionFlowWhole"^^xsd:string
782 ] 779 ]
783 ] [ sp:object 780 ] [ sp:object
784 - [ sp:varName "productionFlowMixedPart"^^xsd:string
785 - ] ;
786 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
787 - sp:subject
788 - [ sp:varName "productionFlowWhole"^^xsd:string
789 - ]
790 - ] [ sp:object
791 [ sp:varName "productionFlowFacility"^^xsd:string 781 [ sp:varName "productionFlowFacility"^^xsd:string
792 ] ; 782 ] ;
793 sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ; 783 sp:predicate <http://www.reportinghub.no/ep/schema/flow#flowIntoOrOutOf> ;
...@@ -802,218 +792,36 @@ mpr-tables:GasSales ...@@ -802,218 +792,36 @@ mpr-tables:GasSales
802 [ sp:varName "productionFlowFacility"^^xsd:string 792 [ sp:varName "productionFlowFacility"^^xsd:string
803 ] 793 ]
804 ] [ sp:object 794 ] [ sp:object
805 - [ sp:varName "productionFlowMixedPart"^^xsd:string 795 + [ sp:varName "productFlowWhole"^^xsd:string
806 - ] ;
807 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
808 - sp:subject
809 - [ sp:varName "productFlowPartOfMixedPart"^^xsd:string
810 - ]
811 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductFlow> ;
812 - sp:predicate rdf:type ;
813 - sp:subject
814 - [ sp:varName "productFlowPartOfMixedPart"^^xsd:string
815 - ]
816 - ] [ sp:object
817 - [ sp:varName "productFlowPartOfMixedPart"^^xsd:string
818 - ] ;
819 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
820 - sp:subject
821 - [ sp:varName "productFlowInMonth"^^xsd:string
822 - ]
823 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#FlowDuringMonth> ;
824 - sp:predicate rdf:type ;
825 - sp:subject
826 - [ sp:varName "productFlowInMonth"^^xsd:string
827 - ]
828 - ] [ sp:object
829 - [ sp:varName "materialFlowedInMonth"^^xsd:string
830 - ] ;
831 - sp:predicate <http://www.reportinghub.no/ep/schema/flow#materialThatFlows> ;
832 - sp:subject
833 - [ sp:varName "productFlowInMonth"^^xsd:string
834 - ]
835 - ] [ sp:object
836 - [ sp:varName "materialFlowedInMonth"^^xsd:string
837 - ] ;
838 - sp:predicate <http://www.reportinghub.no/ep/schema/core#spatialPartOf> ;
839 - sp:subject
840 - [ sp:varName "spatialPartOfProductFlowInMonth"^^xsd:string
841 - ]
842 - ] [ sp:object
843 - [ sp:varName "spatialPartOfProductFlowInMonth"^^xsd:string
844 - ] ;
845 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
846 - sp:subject
847 - [ sp:varName "movedProduct"^^xsd:string
848 - ]
849 - ] [ sp:object
850 - [ sp:varName "movedProduct"^^xsd:string
851 - ] ;
852 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#movedProduct> ;
853 - sp:subject
854 - [ sp:varName "productTransaction"^^xsd:string
855 - ]
856 - ] [ sp:object
857 - [ sp:varName "sellerEnergyQuantity"^^xsd:string
858 - ] ;
859 - sp:predicate rdf:type ;
860 - sp:subject
861 - [ sp:varName "movedProduct"^^xsd:string
862 - ]
863 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Work> ;
864 - sp:predicate rdf:type ;
865 - sp:subject
866 - [ sp:varName "sellerEnergyQuantity"^^xsd:string
867 - ]
868 - ] [ sp:object
869 - [ sp:varName "sellerEnergyValue"^^xsd:string
870 - ] ;
871 - sp:predicate <http://www.reportinghub.no/ep/schema/core#megajoule> ;
872 - sp:subject
873 - [ sp:varName "sellerEnergyQuantity"^^xsd:string
874 - ]
875 - ] [ sp:object
876 - [ sp:varName "movedProduct"^^xsd:string
877 - ] ;
878 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
879 - sp:subject
880 - [ sp:varName "volumeOfMovedProduct"^^xsd:string
881 - ]
882 - ] [ sp:object
883 - [ sp:varName "sellerVolumeQuantity"^^xsd:string
884 - ] ;
885 - sp:predicate rdf:type ;
886 - sp:subject
887 - [ sp:varName "volumeOfMovedProduct"^^xsd:string
888 - ]
889 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ;
890 - sp:predicate rdf:type ;
891 - sp:subject
892 - [ sp:varName "sellerVolumeQuantity"^^xsd:string
893 - ]
894 - ] [ sp:object
895 - [ sp:varName "sellerVolumeValue"^^xsd:string
896 - ] ;
897 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ;
898 - sp:subject
899 - [ sp:varName "sellerVolumeQuantity"^^xsd:string
900 - ]
901 - ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#ProductTransaction> ;
902 - sp:predicate rdf:type ;
903 - sp:subject
904 - [ sp:varName "productTransaction"^^xsd:string
905 - ]
906 - ] [ sp:object
907 - [ sp:varName "salesActivity"^^xsd:string
908 ] ; 796 ] ;
909 - sp:predicate <http://www.reportinghub.no/ep/schema/core#hasPart> ; 797 + sp:predicate <http://www.reportinghub.no/ep/schema/flow#hasMixedPart> ;
910 sp:subject 798 sp:subject
911 - [ sp:varName "productTransaction"^^xsd:string 799 + [ sp:varName "productionFlowWhole"^^xsd:string
912 ] 800 ]
913 - ] [ sp:object <http://www.reportinghub.no/ep/schema/production-activity#SalesActivity> ; 801 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#WholeLifeProductFlow> ;
914 sp:predicate rdf:type ; 802 sp:predicate rdf:type ;
915 sp:subject 803 sp:subject
916 - [ sp:varName "salesActivity"^^xsd:string 804 + [ sp:varName "productFlowWhole"^^xsd:string
917 - ]
918 - ] [ sp:object
919 - [ sp:varName "sellerPart"^^xsd:string
920 - ] ;
921 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#seller> ;
922 - sp:subject
923 - [ sp:varName "salesActivity"^^xsd:string
924 - ]
925 - ] [ sp:object
926 - [ sp:varName "seller"^^xsd:string
927 - ] ;
928 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
929 - sp:subject
930 - [ sp:varName "sellerPart"^^xsd:string
931 - ]
932 - ] [ sp:object
933 - [ sp:varName "sellerName"^^xsd:string
934 - ] ;
935 - sp:predicate <http://www.reportinghub.no/np/schema/npd#name> ;
936 - sp:subject
937 - [ sp:varName "seller"^^xsd:string
938 ] 805 ]
939 ] [ rdf:type sp:Optional ; 806 ] [ rdf:type sp:Optional ;
940 sp:elements ([ sp:object 807 sp:elements ([ sp:object
941 - [ sp:varName "buyerPart"^^xsd:string 808 + [ sp:varName "productFlowMaterialType"^^xsd:string
942 - ] ;
943 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#buyer> ;
944 - sp:subject
945 - [ sp:varName "salesActivity"^^xsd:string
946 - ]
947 - ] [ sp:object
948 - [ sp:varName "buyer"^^xsd:string
949 - ] ;
950 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
951 - sp:subject
952 - [ sp:varName "buyerPart"^^xsd:string
953 - ]
954 - ] [ sp:object
955 - [ sp:varName "buyerName"^^xsd:string
956 - ] ;
957 - sp:predicate <http://www.reportinghub.no/ep/schema/core#name> ;
958 - sp:subject
959 - [ sp:varName "buyer"^^xsd:string
960 - ]
961 - ] [ sp:object
962 - [ sp:varName "buyerMovedProduct"^^xsd:string
963 - ] ;
964 - sp:predicate <http://www.reportinghub.no/ep/schema/production-activity#movedProduct> ;
965 - sp:subject
966 - [ sp:varName "salesActivity"^^xsd:string
967 - ]
968 - ] [ sp:object <http://www.reportinghub.no/ep/schema/material#Fluid> ;
969 - sp:predicate rdf:type ;
970 - sp:subject
971 - [ sp:varName "buyerMovedProduct"^^xsd:string
972 - ]
973 - ] [ sp:object
974 - [ sp:varName "buyerEnergyQuantity"^^xsd:string
975 - ] ;
976 - sp:predicate rdf:type ;
977 - sp:subject
978 - [ sp:varName "buyerMovedProduct"^^xsd:string
979 - ]
980 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Work> ;
981 - sp:predicate rdf:type ;
982 - sp:subject
983 - [ sp:varName "buyerEnergyQuantity"^^xsd:string
984 - ]
985 - ] [ sp:object
986 - [ sp:varName "buyerEnergyValue"^^xsd:string
987 - ] ;
988 - sp:predicate <http://www.reportinghub.no/ep/schema/core#megajoule> ;
989 - sp:subject
990 - [ sp:varName "buyerEnergyQuantity"^^xsd:string
991 - ]
992 - ] [ sp:object
993 - [ sp:varName "buyerMovedProduct"^^xsd:string
994 - ] ;
995 - sp:predicate <http://www.reportinghub.no/ep/schema/core#temporalPartOf> ;
996 - sp:subject
997 - [ sp:varName "buyerMovedProductPart"^^xsd:string
998 - ]
999 - ] [ sp:object
1000 - [ sp:varName "buyerVolumeQuantity"^^xsd:string
1001 ] ; 809 ] ;
1002 sp:predicate rdf:type ; 810 sp:predicate rdf:type ;
1003 sp:subject 811 sp:subject
1004 - [ sp:varName "buyerMovedProductPart"^^xsd:string 812 + [ sp:varName "productFlowWhole"^^xsd:string
1005 ] 813 ]
1006 - ] [ sp:object <http://www.reportinghub.no/ep/schema/core#Volume> ; 814 + ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
1007 sp:predicate rdf:type ; 815 sp:predicate rdf:type ;
1008 sp:subject 816 sp:subject
1009 - [ sp:varName "buyerVolumeQuantity"^^xsd:string 817 + [ sp:varName "productFlowMaterialType"^^xsd:string
1010 ] 818 ]
1011 ] [ sp:object 819 ] [ sp:object
1012 - [ sp:varName "buyerVolumeValue"^^xsd:string 820 + [ sp:varName "materialTypeName"^^xsd:string
1013 ] ; 821 ] ;
1014 - sp:predicate <http://www.reportinghub.no/ep/schema/core#metre3> ; 822 + sp:predicate rdfs:label ;
1015 sp:subject 823 sp:subject
1016 - [ sp:varName "buyerVolumeQuantity"^^xsd:string 824 + [ sp:varName "productFlowMaterialType"^^xsd:string
1017 ] 825 ]
1018 ]) 826 ])
1019 ] [ rdf:type sp:Optional ; 827 ] [ rdf:type sp:Optional ;
...@@ -1039,27 +847,6 @@ mpr-tables:GasSales ...@@ -1039,27 +847,6 @@ mpr-tables:GasSales
1039 ]) 847 ])
1040 ] [ rdf:type sp:Optional ; 848 ] [ rdf:type sp:Optional ;
1041 sp:elements ([ sp:object 849 sp:elements ([ sp:object
1042 - [ sp:varName "productFlowMaterialType"^^xsd:string
1043 - ] ;
1044 - sp:predicate rdf:type ;
1045 - sp:subject
1046 - [ sp:varName "productionFlowMixedPart"^^xsd:string
1047 - ]
1048 - ] [ sp:object <http://www.reportinghub.no/ep/schema/flow#ProductMaterialType> ;
1049 - sp:predicate rdf:type ;
1050 - sp:subject
1051 - [ sp:varName "productFlowMaterialType"^^xsd:string
1052 - ]
1053 - ] [ sp:object
1054 - [ sp:varName "materialTypeName"^^xsd:string
1055 - ] ;
1056 - sp:predicate rdfs:label ;
1057 - sp:subject
1058 - [ sp:varName "productFlowMaterialType"^^xsd:string
1059 - ]
1060 - ])
1061 - ] [ rdf:type sp:Optional ;
1062 - sp:elements ([ sp:object
1063 [ sp:varName "productionFlowDefinitionType"^^xsd:string 850 [ sp:varName "productionFlowDefinitionType"^^xsd:string
1064 ] ; 851 ] ;
1065 sp:predicate rdf:type ; 852 sp:predicate rdf:type ;
......
...@@ -7,7 +7,7 @@ WHERE { ...@@ -7,7 +7,7 @@ WHERE {
7 ?productVolumeReport ep-core:partOf ?report . 7 ?productVolumeReport ep-core:partOf ?report .
8 ?productVolumeReport a ep-report:ProductVolumeReport . 8 ?productVolumeReport a ep-report:ProductVolumeReport .
9 ?productVolumeReport ep-report:reportOn ?productionFlowsInReportingPeriod . 9 ?productVolumeReport ep-report:reportOn ?productionFlowsInReportingPeriod .
10 - ?productionFlowsInReportingPeriod a ep-flow:ProductionFlow . 10 + ?productionFlowsInReportingPeriod a ep-flow:ProductionFlowNetwork .
11 ?stateOfField ep-flow:facilityContainsFlow ?productionFlowsInReportingPeriod . 11 ?stateOfField ep-flow:facilityContainsFlow ?productionFlowsInReportingPeriod .
12 ?stateOfField ep-core:temporalPartOf ?reportedField . 12 ?stateOfField ep-core:temporalPartOf ?reportedField .
13 ?reportedField npd:name ?reportedFieldName . 13 ?reportedField npd:name ?reportedFieldName .
...@@ -30,7 +30,7 @@ let:facilityName="{# SELECT DISTINCT ...@@ -30,7 +30,7 @@ let:facilityName="{# SELECT DISTINCT
30 { 30 {
31 31
32 ?report a ep-report:ProductionReport . 32 ?report a ep-report:ProductionReport .
33 -?report ep-report:reportSubmittedBy ?submittingFieldState . 33 +?report ep-report:reportSubmittedFrom ?submittingFieldState .
34 ?submittingFieldState ep-core:temporalPartOf ?submittingField . 34 ?submittingFieldState ep-core:temporalPartOf ?submittingField .
35 ?submittingField npd:name ?submittingFieldName . 35 ?submittingField npd:name ?submittingFieldName .
36 36
......