update waste ontology, separating view

1 files changed, 25 insertions, 17 deletions

diff --git a/rdf/waste.sdm b/rdf/waste.sdm
index 164c976..08c387c 100644
--- a/rdf/waste.sdm
+++ b/rdf/waste.sdm
@@ -1,29 +1,37 @@
-module waste base <https://thoughtroam.abcdefghijklmnopqrstuvxyzæøå.dk/rdf/> is
+module waste action <https://thoughtroam.abcdefghijklmnopqrstuvxyzæøå.dk/rdf/> is
 
-  entity Citizen
+  import [ dc skos xsd ]
+  import [ waste_view ]
 
-  entity Host
+  entity Resident is
+    identity personId -> unknown
 
-  entity WasteCollector
-
-  structure Garbage is
-    isGrosserThan -> Trash
+    viewsWasteAs -> waste_view:Grossness
+    emptiesBinsPerMonth -> {0..20} BinPurge
   end
 
-  structure Trash is
-    isGrosserThan -> Rubbish
-  end
+  entity Household is
+    identity apartmentId -> unknown
 
-  structure Rubbish is
-    isGrosserThan -> Waste
+    contains -> {1..9} Bin
+    inhabitedBy -> {1..4} Resident
   end
 
-  structure Waste is
-    isGrosserThan -> Litter
-  end
+;  entity Host is
+;    provides -> Container
+;  end
 
-  structure Litter is
-    isGrosserThan -> Refuse
+  entity WasteCollector
+
+  structure BinPurge is
+    movesWasteFrom -> Bin
+    movesWasteTo -> Container
   end
 
+  structure Bin
+
+  structure Container
+
+  structure Incinerator
+
 end