Improve portals query

Now each attribute is optional, and it does not have to match all the optional
attributes.

1 files changed, 7 insertions, 1 deletions

diff --git a/create-data.js b/create-data.js
index 6ba0408..698c63e 100755
--- a/create-data.js
+++ b/create-data.js
@@ -1072,14 +1072,20 @@ function getPortals(callback) {
     var query = "PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>\
 PREFIX portals: <http://purl.org/openorg/portals/>\
 PREFIX geo: <http://www.w3.org/2003/01/geo/wgs84_pos#>\
-SELECT * WHERE {\
+SELECT DISTINCT * WHERE {\
     ?portal a portals:BuildingEntrance;\
             portals:connectsBuilding ?building;\
     OPTIONAL {\
         ?portal rdfs:comment ?comment .\
+    }\
+    OPTIONAL {\
         ?portal rdfs:label ?label .\
+    }\
+    OPTIONAL {\
         ?portal geo:lat ?lat .\
         ?portal geo:long ?long .\
+    }\
+    OPTIONAL {\
         ?portal portals:connectsFloor ?floor\
     }\
 }"