From 5e8ba55f6dd4d31d2e846653726e34a5b61cdba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Mon, 18 May 2020 14:26:42 +0200 Subject: [PATCH] use data cached in opengis connector where possible --- debian/50gnm.py | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/debian/50gnm.py b/debian/50gnm.py index 3bba10a..5bef1fc 100644 --- a/debian/50gnm.py +++ b/debian/50gnm.py @@ -78,7 +78,7 @@ JSON_CELL_TYPES = { ] }, "taxi": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=pvo_patrimoine_voirie.pvostationtaxi&filter=gid[gid]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/taxi/?property:gid={{gid}}", "name": u"Station de taxi", "cache_duration": 86400, "force_async": False, @@ -91,7 +91,7 @@ JSON_CELL_TYPES = { ] }, "mdr": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&maxfeatures=30&request=GetFeature&typename=ter_territoire.maison_de_la_metropole&SRSNAME=urn:ogc:def:crs:EPSG::4326&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/mdr/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Maison de la Métropole de Lyon", @@ -104,7 +104,7 @@ JSON_CELL_TYPES = { ] }, "piscine": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&maxfeatures=30&request=GetFeature&typename=adr_voie_lieu.adrequippiscinepct&SRSNAME=urn:ogc:def:crs:EPSG::4326&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/piscine/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Piscine de la Métropole de Lyon", @@ -117,7 +117,7 @@ JSON_CELL_TYPES = { ] }, "mairie": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&maxfeatures=30&request=GetFeature&typename=adr_voie_lieu.adrmairiepct_2_0_0&SRSNAME=urn:ogc:def:crs:EPSG::4326&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/mairie/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Mairie", @@ -130,7 +130,7 @@ JSON_CELL_TYPES = { ] }, "decheterie": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=gip_proprete.gipdecheterie_2_0_0&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/decheterie/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Déchèterie", @@ -143,7 +143,7 @@ JSON_CELL_TYPES = { ] }, "donnerie": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=gip_proprete.gipdonnerie_2_0_0&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/donnerie/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Donnerie", @@ -156,7 +156,7 @@ JSON_CELL_TYPES = { ] }, "bibliotheque": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=adr_voie_lieu.adrequiculturepct&SRSNAME=urn:ogc:def:crs:EPSG::4171&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/bibliotheque/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Bibliothèque", @@ -169,7 +169,7 @@ JSON_CELL_TYPES = { ] }, "aire-de-covoiturage": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=pvo_patrimoine_voirie.pvoparking&filter=gid[gid]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/aire-de-covoiturage/?property:gid={{gid}}", "cache_duration": 86400, "force_async": False, "name": u"Aire de covoiturage", @@ -268,7 +268,7 @@ JSON_CELL_TYPES = { } }, "silo-a-verre": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=gic_collecte.gicsiloverre&filter=identifiant[identifiant]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/silo-a-verre/?property:identifiant={{identifiant}}", "cache_duration": 86400, "force_async": False, "name": u"Silo à verre", @@ -375,7 +375,7 @@ JSON_CELL_TYPES = { ] }, "parc-velo": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=pvo_patrimoine_voirie.pvostationnementvelo&filter=gid[gid]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/parc-velo/?property:gid={{gid}}", "cache_duration": 86400, "force_async": False, "name": u"Parc de stationnement vélos", @@ -388,7 +388,7 @@ JSON_CELL_TYPES = { ] }, "autopartage": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=pvo_patrimoine_voirie.pvostationautopartage&filter=gid[gid]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/autopartage/?property:gid={{gid}}", "cache_duration": 86400, "force_async": False, "name": u"Autopartage", @@ -401,7 +401,7 @@ JSON_CELL_TYPES = { ] }, "stationnement-pmr": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&outputformat=GEOJSON&request=GetFeature&typename=vdl_deplacements.emplacement_pmr&filter=gid[gid]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/stationnement-pmr/?property:gid={{gid}}", "cache_duration": 86400, "force_async": False, "name": u"Stationnement réglementé pour les PMR", @@ -414,7 +414,7 @@ JSON_CELL_TYPES = { ] }, "toilette": { - "url": "https://download.data.grandlyon.com/wfs/grandlyon?SERVICE=WFS&VERSION=2.0.0&request=GetFeature&typename=adr_voie_lieu.toilettepublique_latest&outputFormat=application/json;%20subtype=geojson&startIndex=0&filter=gid[gid]", + "url": "{{passerelle_url}}opengis/data-grandlyon-general/query/toilette/?property:gid={{gid}}", "cache_duration": 86400, "force_async": False, "name": u"Toilette publique",