Commit cc8277f2 authored by Benoit Orihuela's avatar Benoit Orihuela
Browse files

Merge branch 'fix/incorrect-temporal-queries-with-geoquery' into 'develop'

fix: temporal queries using a geoquery

See merge request !73
parents 4e0984d3 76267c8d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ ${expectation_file}= vehicles-temporal-representation-021-09-expectation.json
Near Point            near;maxDistance==2000    Point       [-8.503,41.202]                                                                  ${EMPTY}       vehicles-temporal-representation-021-09-01-expectation.jsonld
                      [Tags]                    te-query    5_7_4

Within Polygon        within                    Polygon     [[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-15.23,21.37]]    location       vehicles-temporal-representation-021-09-02-expectation.jsonld
Within Polygon        contains                  Polygon     [[[-13.503,47.202],[6.541, 52.961],[20.37,44.653],[9.46,32.57],[-13.503,32.57],[-13.503,47.202]]]  location       vehicles-temporal-representation-021-09-02-expectation.jsonld
                      [Tags]                    te-query    5_7_4

*** Keywords ***
+18 −12
Original line number Diff line number Diff line
@@ -37,19 +37,25 @@
   ],
   "location":[
      {
        "type": "GeoProperty",
        "value": {
            "type":"Point",
            "coordinates":[
            -8.5,
            41.2
         ],
                2.35,
                42.22
            ]
        },
        "observedAt":"2020-10-01T12:03:00Z"
      },
      {
        "type": "GeoProperty",
        "value": {
             "type":"Point",
             "coordinates":[
            2.35,
            42.22
         ],
                -8.5,
                41.2
            ]
        },
        "observedAt":"2020-10-01T12:05:00Z"
      }
   ],
+19 −5
Original line number Diff line number Diff line
@@ -38,12 +38,26 @@
      ],
      "location":[
         {
            "type": "GeoProperty",
            "value": {
                "type":"Point",
                "coordinates":[
                    2.35,
                    42.22
                ]
            },
            "observedAt":"2020-10-01T12:03:00Z"
         },
         {
            "type": "GeoProperty",
            "value": {
                "type":"Point",
                "coordinates":[
                   -8.5,
                   41.2
            ],
            "observedAt":"2020-10-01T12:03:00Z"
                ]
            },
            "observedAt":"2020-10-01T12:05:00Z"
         }
      ]
   }
+16 −10
Original line number Diff line number Diff line
@@ -38,19 +38,25 @@
      ],
      "location":[
         {
            "type": "GeoProperty",
            "value": {
                "type":"Point",
                "coordinates":[
               -8.5,
               41.2
            ],
                    2.35,
                    42.22
                ]
            },
            "observedAt":"2020-10-01T12:03:00Z"
         },
         {
            "type": "GeoProperty",
            "value": {
                "type":"Point",
                "coordinates":[
               -8.45,
               41.22
            ],
                   -8.5,
                   41.2
                ]
            },
            "observedAt":"2020-10-01T12:05:00Z"
         }
      ]