Commit 782ee08d authored by Blaise de Carné 's avatar Blaise de Carné

Merge branch 'release/2.0.0'

parents 26f776a5 9649c14f
Pipeline #104019 passed with stage
in 18 seconds
......@@ -6,6 +6,12 @@ et ce projet adhère à [Semantic Versioning](http://semver.org/spec/v2.0.0.html
## En cours
## [2.0.0] - 2019-01-14
### Modifications
- Utilisation de l'ontologie DATAtourisme v2.x
- Mise à jour de la documentation
## [1.1.3] - 2018-07-26
### Modifications
......
......@@ -3,7 +3,7 @@
"license": "MIT",
"keywords": ["graphql","datatourisme","api","sparql","opendata"],
"type": "library",
"version": "1.1.3",
"version": "2.0.0",
"homepage": "https://www.datatourisme.gouv.fr",
"authors": [
{
......
This diff is collapsed.
This diff is collapsed.
......@@ -16,7 +16,7 @@ use Datatourisme\Api\Resolver\SparqlResolver\SparqlResolver;
class BlazegraphResolver extends SparqlResolver
{
public static $GEO_PROPERTY = 'http://www.datatourisme.fr/ontology/core/1.0#latlon';
public static $GEO_PROPERTY = 'https://www.datatourisme.gouv.fr/ontology/core#latlon';
/**
* @return \Datatourisme\Api\Resolver\SparqlResolver\QueryBuilder\FilterGenerator
......
......@@ -38,7 +38,7 @@ class InTest extends AbstractGraphQLTest
{
poi(
filters: [
{ rdf_type: {_in: ["http://www.datatourisme.fr/ontology/core/1.0#MusicEvent","http://www.datatourisme.fr/ontology/core/1.0#SportsEvent"]} }
{ rdf_type: {_in: ["https://www.datatourisme.gouv.fr/ontology/core#MusicEvent","https://www.datatourisme.gouv.fr/ontology/core#SportsEvent"]} }
]
)
{
......
......@@ -142,8 +142,8 @@ class FiltersTest extends AbstractGraphQLTest
{
poi(
filters: [
{ rdf_type: { _eq : "http://www.datatourisme.fr/ontology/core/1.0#PointOfInterest" }},
{ rdf_type: { _eq : "http://www.datatourisme.fr/ontology/core/1.0#EntertainmentAndEvent" }}
{ rdf_type: { _eq : "https://www.datatourisme.gouv.fr/ontology/core#PointOfInterest" }},
{ rdf_type: { _eq : "https://www.datatourisme.gouv.fr/ontology/core#EntertainmentAndEvent" }}
]
)
{
......
......@@ -17,7 +17,7 @@ class HDTTest extends TestCase
{
public function testCount()
{
$resolver = new HdtResolver(__DIR__.'/../dataset.hdt');
$resolver = new HdtResolver(__DIR__ . '/../dataset.hdt');
$api = DatatourismeApi::create($resolver);
$res = json_encode($api->process('
{
......
......@@ -76,7 +76,7 @@ class MiscTest extends AbstractGraphQLTest
}
}
}');
$this->assertEquals('{"data":{"poi":{"total":1,"results":[{"hasDescription":[{"rdf_type":["http:\/\/www.datatourisme.fr\/ontology\/core\/1.0#Description"]}]}]}}}', $res);
$this->assertEquals('{"data":{"poi":{"total":1,"results":[{"hasDescription":[{"rdf_type":["https:\/\/www.datatourisme.gouv.fr\/ontology\/core#Description"]}]}]}}}', $res);
}
public function testRdfType2()
......@@ -86,7 +86,7 @@ class MiscTest extends AbstractGraphQLTest
poi(
size:1
filters: [
{ rdf_type:{_eq:"http://www.datatourisme.fr/ontology/core/1.0#PlaceOfInterest"}}
{ rdf_type:{_eq:"https://www.datatourisme.gouv.fr/ontology/core#PlaceOfInterest"}}
]
)
{
......
No preview for this file type
@prefix schema: <http://schema.org/> .
@prefix : <http://www.datatourisme.fr/ontology/core/1.0#> .
@prefix : <https://www.datatourisme.gouv.fr/ontology/core#> .
@prefix bd: <http://www.bigdata.com/rdf#> .
@prefix data: <https://data.datatourisme.gouv.fr/> .
@prefix owl: <http://www.w3.org/2002/07/owl#> .
......@@ -7,17 +7,17 @@
@prefix fn: <http://www.w3.org/2005/xpath-functions#> .
@prefix skos: <http://www.w3.org/2004/02/skos/core#> .
@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#> .
@prefix align: <http://www.datatourisme.fr/ontology/alignment/1.0#> .
@prefix dt: <http://www.datatourisme.fr/ontology/core/1.0#> .
@prefix align: <hhttps://www.datatourisme.gouv.fr/ontology/alignment#> .
@prefix dt: <https://www.datatourisme.gouv.fr/ontology/core#> .
@prefix dct: <http://purl.org/dc/terms/> .
@prefix xml: <http://www.w3.org/XML/1998/namespace> .
@prefix kb: <http://www.datatourisme.fr/resource/core/1.0#> .
@prefix kb: <https://www.datatourisme.gouv.fr/resource/core/1.0#> .
@prefix foaf: <http://xmlns.com/foaf/0.1/> .
@prefix bds: <http://www.bigdata.com/rdf/search#> .
@prefix core: <http://www.datatourisme.fr/ontology/core/1.0#> .
@prefix core: <https://www.datatourisme.gouv.fr/ontology/core#> .
@prefix olo: <http://purl.org/ontology/olo/core#> .
@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#> .
@prefix meta: <http://www.datatourisme.fr/resource/metadata/1.0#> .
@prefix meta: <https://www.datatourisme.gouv.fr/resource/metadata#> .
@prefix hint: <http://www.bigdata.com/queryHints#> .
@prefix ebucore: <http://www.ebu.ch/metadata/ontologies/ebucore/ebucore#> .
@prefix igeo: <http://rdf.insee.fr/def/geo#> .
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment