Use URIs for some categories, and add new category "non-grocery store".

10 files changed, 18 insertions, 15 deletions

diff --git a/bin/rdf2hours b/bin/rdf2hours
index f40c921..766ab52 100755
--- a/bin/rdf2hours
+++ b/bin/rdf2hours
@@ -34,8 +34,9 @@ use HTML::HTML5::Writer;
 
 # TODO: add override options --theme and (multivalued) --category
 my @category = <<LIST =~ m/(\S.*\S)/g;
-	restaurant
-	groceries
+	<http://schema.org/FoodEstablishment>
+	<http://schema.org/GroceryStore>
+	non-grocery store
 	attraction
 	transport
 	public service
@@ -278,10 +279,11 @@ sub daterangedescribe {
 sub categorydescribe {
 	my $cat = shift;
 
-	$cat =~ s/restaurant/spisesteder/;
-	$cat =~ s/groceries/dagligvarer/;
-	$cat =~ s/attraction/attraktioner og museer/;
-	$cat =~ s/public service/offentlige services/;
+	$cat =~ s!<http://schema.org/FoodEstablishment>!spisesteder!;
+	$cat =~ s!<http://schema.org/GroceryStore>!dagligvarebutikker!;
+	$cat =~ s!non-grocery store!øvrige butikker!;
+	$cat =~ s!attraction!attraktioner og museer!;
+	$cat =~ s!public service!offentlige services!;
 
 	return ucfirst($cat);
 }
diff --git a/data/org/artdoor.ttl b/data/org/artdoor.ttl
index dba7446..0397014 100644
--- a/data/org/artdoor.ttl
+++ b/data/org/artdoor.ttl
@@ -9,7 +9,7 @@
 
 _:artdoorGallery
 	a schema:Place;
-	gr:category "shop", "gallery", "restaurant" ;
+	gr:category "shop", "gallery", schema:FoodEstablishment, schema:CafeOrCoffeeShop ;
 	gr:name "Galleri ArtDoor"@da;
 	foaf:Homepage <http://www.galleriartdoor.dk/>;
 	gr:hasOpeningHourSpecification _:artdoorHours .
diff --git a/data/org/brugsen.ttl b/data/org/brugsen.ttl
index 8d9e070..a86fd88 100644
--- a/data/org/brugsen.ttl
+++ b/data/org/brugsen.ttl
@@ -6,7 +6,7 @@
 
 []
 	a gr:BusinessEntity, schema:Place;
-	gr:category "groceries";
+	gr:category schema:GroceryStore ;
 	gr:name "Dagli'Brugsen";
 	foaf:page <https://om.coop.dk/om+coop/vores+butikker/find+butik.aspx?id=4369> ;
 	schema:address [
diff --git a/data/org/camping.ttl b/data/org/camping.ttl
index d260665..c115d3f 100644
--- a/data/org/camping.ttl
+++ b/data/org/camping.ttl
@@ -12,7 +12,7 @@
 
 _:ishuset
 	a schema:Place;
-	gr:category "restaurant";
+	gr:category schema:FoodEstablishment, schema:IceCreamShop ;
 	schema:telephone "+45-23353458";
 	gr:name "Orø Camping - Ishuset"@da;
 	foaf:page <http://www.oroecamping.dk/50-ishus.htm>;
diff --git a/data/org/gaardstronomi.ttl b/data/org/gaardstronomi.ttl
index fac9286..5bb361d 100644
--- a/data/org/gaardstronomi.ttl
+++ b/data/org/gaardstronomi.ttl
@@ -6,7 +6,7 @@
 
 []
 	a gr:BusinessEntity, schema:Place;
-	gr:category "restaurant";
+	gr:category schema:FoodEstablishment, schema:Restaurant ;
 	gr:name "Gaardstronomi";
 	foaf:Homepage <http://www.gaardstronomi.dk/> ;
 	schema:address [
diff --git a/data/org/havnegrill.ttl b/data/org/havnegrill.ttl
index 49cc5b1..227c091 100644
--- a/data/org/havnegrill.ttl
+++ b/data/org/havnegrill.ttl
@@ -6,7 +6,7 @@
 
 []
 	a gr:BusinessEntity, schema:Place ;
-	gr:category "restaurant" ;
+	gr:category schema:FoodEstablishment, schema:FastFoodRestaurant, schema:IceCreamShop ;
 	gr:name "Havnegrillen Orø Havn"@da ;
 	foaf:page <http://cvr.dk/Site/Forms/CompanySearch/CompanySearch.aspx?cvrnr=29437386> ;
 	gr:hasOpeningHourSpecification [
diff --git a/data/org/kro.ttl b/data/org/kro.ttl
index 207c65c..dbf479d 100644
--- a/data/org/kro.ttl
+++ b/data/org/kro.ttl
@@ -5,7 +5,7 @@
 
 []
 	a gr:BusinessEntity;
-	gr:category "restaurant", "accomodation";
+	gr:category schema:FoodEstablishment, schema:Restaurant, "accomodation";
 	gr:name "Hotel Orø Kro";
 	foaf:page <http://www.oroekro.dk/>;
 	schema:address [
diff --git a/data/org/marlieses.ttl b/data/org/marlieses.ttl
index 6f497ea..ce2e372 100644
--- a/data/org/marlieses.ttl
+++ b/data/org/marlieses.ttl
@@ -7,7 +7,7 @@
 
 :home
 	a schema:Place;
-	gr:category "restaurant";
+	gr:category schema:FoodEstablishment, schema:CafeOrCoffeeShop, schema:IceCreamShop ;
 	schema:telephone "+45-59470744";
 	gr:name "Marliese’s Gårdcafé"@da;
 	foaf:Homepage <http://marliesesgaardcafe.dk/>;
diff --git a/data/org/oe-butikken.ttl b/data/org/oe-butikken.ttl
index 2916c9c..0cc0808 100644
--- a/data/org/oe-butikken.ttl
+++ b/data/org/oe-butikken.ttl
@@ -5,7 +5,8 @@
 
 []
 	a schema:Place;
-	gr:category "shop";
+	# drop custom string when unneeded for resolving
+	gr:category schema:GardenStore, schema:HobbyShop, "non-grocery store";
 	gr:name "Ø-butikken"@da;
 	schema:email "obutikken@mail.dk";
 	gr:hasOpeningHourSpecification [
diff --git a/data/org/spisestedet.ttl b/data/org/spisestedet.ttl
index fca0139..6506a3a 100644
--- a/data/org/spisestedet.ttl
+++ b/data/org/spisestedet.ttl
@@ -6,7 +6,7 @@
 
 []
 	a schema:Place;
-	gr:category "restaurant";
+	gr:category schema:FoodEstablishment, schema:Restaurant ;
 	gr:name "Spisestedet Orø";
 	foaf:Homepage <http://www.spisestedet-orø.dk/> ;
 	schema:address [