[tracker/tracker-0.10] tracker-extract, -writeback, libtracker-extract, NMM, NFO: Use nfo:heading instead of nmm:direction

[Martyn James Russell <mr src gnome org>]

commit a0663101f7ec34ab1bfc72735740fa5e1448c2cf
Author: Philip Van Hoof <philip codeminded be>
Date:   Fri Jun 10 17:03:38 2011 +0200

    tracker-extract, -writeback, libtracker-extract, NMM, NFO: Use nfo:heading instead of nmm:direction

 data/ontologies/33-nfo.ontology               |    3 ++-
 data/ontologies/38-nmm.ontology               |    9 +--------
 src/libtracker-extract/tracker-xmp.c          |    2 +-
 src/tracker-extract/tracker-extract-gif.c     |    2 +-
 src/tracker-extract/tracker-extract-jpeg.c    |    2 +-
 src/tracker-extract/tracker-extract-png.c     |    2 +-
 src/tracker-extract/tracker-extract-tiff.c    |    2 +-
 src/tracker-writeback/tracker-writeback-xmp.c |    2 +-
 8 files changed, 9 insertions(+), 15 deletions(-)
---
diff --git a/data/ontologies/33-nfo.ontology b/data/ontologies/33-nfo.ontology
index 8451e07..a50950a 100644
--- a/data/ontologies/33-nfo.ontology
+++ b/data/ontologies/33-nfo.ontology
@@ -12,7 +12,7 @@
 
 nfo: a tracker:Namespace, tracker:Ontology ;
 	tracker:prefix "nfo" ;
-	nao:lastModified "2011-03-24T10:11:00Z" .
+	nao:lastModified "2011-06-10T17:00:00Z" .
 
 nfo:Document a rdfs:Class ;
 	rdfs:label "Document" ;
@@ -345,6 +345,7 @@ nfo:heading a rdf:Property ;
 	rdfs:label "Heading" ;
 	rdfs:comment "Specifies the direction of travelling while capturing image/video. The range of values from 0.00 to 359.99 (where 0 is due North, 90 is East, 180 South and 270 is West)";
 	nrl:maxCardinality 1;
+	tracker:writeback true ;
 	rdfs:domain nfo:Visual ;
 	rdfs:range xsd:double .
 
diff --git a/data/ontologies/38-nmm.ontology b/data/ontologies/38-nmm.ontology
index f15e2ba..732881e 100644
--- a/data/ontologies/38-nmm.ontology
+++ b/data/ontologies/38-nmm.ontology
@@ -13,7 +13,7 @@
 
 nmm: a tracker:Namespace, tracker:Ontology ;
 	tracker:prefix "nmm" ;
-	nao:lastModified "2011-06-10T01:12:08Z" .
+	nao:lastModified "2011-06-10T16:59:00Z" .
 
 nmm:MusicPiece a rdfs:Class ;
 	rdfs:label "Music" ;
@@ -432,13 +432,6 @@ nmm:isColorCorrected a rdf:Property ;
 	rdfs:domain nmm:Photo ;
 	rdfs:range xsd:boolean .
 
-nmm:direction a rdf:Property ;
-	rdfs:comment "The direction the image is taken (angle wrt map/true north) in degrees (0-359.9)" ;
-	nrl:maxCardinality 1 ;
-	rdfs:domain nmm:Photo ;
-	tracker:writeback true ;
-	rdfs:range xsd:double .
-
 # Radio (IE part)
 nmm:RadioStation a rdfs:Class ;
 	rdfs:label "Radio station" ;
diff --git a/src/libtracker-extract/tracker-xmp.c b/src/libtracker-extract/tracker-xmp.c
index 9108ba2..ac63fb0 100644
--- a/src/libtracker-extract/tracker-xmp.c
+++ b/src/libtracker-extract/tracker-xmp.c
@@ -1010,7 +1010,7 @@ tracker_xmp_apply (TrackerSparqlBuilder *preupdate,
 	}
 
 	if (data->gps_direction) {
-		tracker_sparql_builder_predicate (metadata, "nmm:direction");
+		tracker_sparql_builder_predicate (metadata, "nfo:heading");
 		tracker_sparql_builder_object_unvalidated (metadata, data->gps_direction);
 	}
 
diff --git a/src/tracker-extract/tracker-extract-gif.c b/src/tracker-extract/tracker-extract-gif.c
index b37cf4a..41467eb 100644
--- a/src/tracker-extract/tracker-extract-gif.c
+++ b/src/tracker-extract/tracker-extract-gif.c
@@ -501,7 +501,7 @@ read_metadata (TrackerSparqlBuilder *preupdate,
 	}
 
 	if (xd->gps_direction) {
-		tracker_sparql_builder_predicate (metadata, "nmm:direction");
+		tracker_sparql_builder_predicate (metadata, "nfo:heading");
 		tracker_sparql_builder_object_unvalidated (metadata, xd->gps_direction);
 	}
 
diff --git a/src/tracker-extract/tracker-extract-jpeg.c b/src/tracker-extract/tracker-extract-jpeg.c
index bc8d623..61f158a 100644
--- a/src/tracker-extract/tracker-extract-jpeg.c
+++ b/src/tracker-extract/tracker-extract-jpeg.c
@@ -630,7 +630,7 @@ extract_jpeg (const gchar          *uri,
 	}
 
 	if (md.gps_direction) {
-		tracker_sparql_builder_predicate (metadata, "nmm:direction");
+		tracker_sparql_builder_predicate (metadata, "nfo:heading");
 		tracker_sparql_builder_object_unvalidated (metadata, md.gps_direction);
 	}
 
diff --git a/src/tracker-extract/tracker-extract-png.c b/src/tracker-extract/tracker-extract-png.c
index 887d558..214122d 100644
--- a/src/tracker-extract/tracker-extract-png.c
+++ b/src/tracker-extract/tracker-extract-png.c
@@ -488,7 +488,7 @@ read_metadata (TrackerSparqlBuilder *preupdate,
 	}
 
 	if (xd->gps_direction) {
-		tracker_sparql_builder_predicate (metadata, "nmm:direction");
+		tracker_sparql_builder_predicate (metadata, "nfo:heading");
 		tracker_sparql_builder_object_unvalidated (metadata, xd->gps_direction);
 	}
 
diff --git a/src/tracker-extract/tracker-extract-tiff.c b/src/tracker-extract/tracker-extract-tiff.c
index b61bf3a..a89e892 100644
--- a/src/tracker-extract/tracker-extract-tiff.c
+++ b/src/tracker-extract/tracker-extract-tiff.c
@@ -546,7 +546,7 @@ extract_tiff (const gchar          *uri,
 	}
 
 	if (md.gps_direction) {
-		tracker_sparql_builder_predicate (metadata, "nmm:direction");
+		tracker_sparql_builder_predicate (metadata, "nfo:heading");
 		tracker_sparql_builder_object_unvalidated (metadata, md.gps_direction);
 	}
 
diff --git a/src/tracker-writeback/tracker-writeback-xmp.c b/src/tracker-writeback/tracker-writeback-xmp.c
index e7aaacc..fc006b0 100644
--- a/src/tracker-writeback/tracker-writeback-xmp.c
+++ b/src/tracker-writeback/tracker-writeback-xmp.c
@@ -387,7 +387,7 @@ writeback_xmp_update_file_metadata (TrackerWritebackFile    *wbf,
 		}
 #endif /* SET_TYPICAL_CAMERA_FIELDS */
 
-		if (g_strcmp0 (row[2], TRACKER_NMM_PREFIX "direction") == 0) {
+		if (g_strcmp0 (row[2], TRACKER_NFO_PREFIX "heading") == 0) {
 			xmp_delete_property (xmp, NS_EXIF, "GPSImgDirection");
 			xmp_set_property (xmp, NS_EXIF, "GPSImgDirection", row[3], 0);
 		}