update waste ontology, separating view

3 files changed, 65 insertions, 17 deletions

diff --git a/rdf/sdml-catalog.json b/rdf/sdml-catalog.json
index 48d5392..6da5d03 100644
--- a/rdf/sdml-catalog.json
+++ b/rdf/sdml-catalog.json
@@ -12,6 +12,12 @@
         "relative_url": "waste#",
         "relative_path": "./waste.sdm"
       }
+    },
+    "waste_view": {
+      "item": {
+        "relative_url": "waste_view#",
+        "relative_path": "./waste_view.sdm"
+      }
     }
   }
 }
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
diff --git a/rdf/waste_view.sdm b/rdf/waste_view.sdm
new file mode 100644
index 0000000..4b0a19a
--- /dev/null
+++ b/rdf/waste_view.sdm
@@ -0,0 +1,34 @@
+module waste_view waste_view <https://thoughtroam.abcdefghijklmnopqrstuvxyzæøå.dk/rdf/> is
+
+  ; Grossness: https://english.stackexchange.com/a/272409
+  import [ dc skos xsd ]
+
+  @skos:prefLabel = "Waste perception Ontology"@en
+  @dc:description = "Ways that waste can be subjectively perceived"@en
+  @dc:created = @xsd:date(2024-04-27)
+  @dc:creator = <https://dr.jones.dk/me/#me>
+  @dc:license = <https://spdx.org/licenses/AGPL-3.0-or-later>
+
+  enum Grossness of
+    @owl:equivalentClass = unsigned
+    Refuse is
+      @rdf:value = 1
+    end
+    Litter is
+      @rdf:value = 2
+    end
+    Waste is
+      @rdf:value = 3
+    end
+    Rubbish is
+      @rdf:value = 4
+    end
+    Trash is
+      @rdf:value = 5
+    end
+    Garbage is
+      @rdf:value = 6
+    end
+  end
+
+end