Merge branch 'master' into fix/minister-domain

config/dispatcher/dispatcher.ex

@@ -185,6 +185,11 @@ defmodule Dispatcher do
     Proxy.forward conn, path, "http://resource/document-types-criterions/"
   end  
 
+  match "/site-types/*path", %{ accept: [:json], layer: :api} do
+    Proxy.forward conn, path, "http://resource/site-types/"
+  end
+  
+
   ###############################################################
   # sparql endpoint
   ###############################################################

config/resources/domain.json

@@ -418,7 +418,7 @@
         },
         "cross-border": {
           "type": "boolean",
-          "predicate": "ere:grensoverscheidend"
+          "predicate": "ere:grensoverschrijdend"
         }
       },
       "relationships": {
@@ -631,6 +631,11 @@
           "predicate": "organisatie:bestaatUit",
           "target": "addresses",
           "cardinality": "one"
+        },
+        "site-type": {
+          "predicate": "ere:vestigingstype",
+          "target": "site-types",
+          "cardinality": "one"
         }
       },
       "new-resource-base": "http://data.lblod.info/id/vestigingen/"
@@ -900,6 +905,16 @@
         }
       },
       "new-resource-base": "http://lblod.data.gift/concepts/"
+    },
+    "site-types": {
+      "class": "code:TypeVestiging",
+      "attributes": {
+        "label": {
+          "type": "string",
+          "predicate": "skos:prefLabel"
+        }
+      },
+      "new-resource-base": "http://lblod.data.gift/concepts/"
     }
   }
 }