Skip to content

Commit

Permalink
Merge pull request mviewer#888 from mviewer/develop
Browse files Browse the repository at this point in the history
Release 3.11
  • Loading branch information
lecault authored May 13, 2024
2 parents 610c59a + 40cac86 commit c567710
Show file tree
Hide file tree
Showing 29 changed files with 1,467 additions and 705 deletions.
6 changes: 6 additions & 0 deletions css/mviewer.css
Original file line number Diff line number Diff line change
Expand Up @@ -1179,6 +1179,12 @@ ul#searchparameters{
border-radius:0px;
}

/*Sensorthing control only*/
.list-streams ul.nav-pills.nav-stacked {
padding-left: 0px;
}
/*-x-*/

li.level-2{
text-indent:9px;
}
Expand Down
2 changes: 1 addition & 1 deletion customlayers/pnr_ign.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@

mviewer.customLayers.pnr.layer = new ol.layer.Vector({
source: new ol.source.Vector({
url: "https://wxs.ign.fr/environnement/geoportail/wfs?SERVICE=WFS&VERSION=1.0.0&REQUEST=GETFEATURE&TYPENAME= PROTECTEDAREAS.PNR:pnr&outputFormat=application/json&srsName=EPSG:4326",
url: "https://data.geopf.fr/wfs?SERVICE=WFS&VERSION=2.0.0&REQUEST=GETFEATURE&TYPENAME=PROTECTEDAREAS.PNR:pnr&outputFormat=application/json&srsName=EPSG:4326",
format: new ol.format.GeoJSON(),
}),
style: function (feature, resolution) {
Expand Down
2 changes: 1 addition & 1 deletion demo/addons/isochroneAddon/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
"target": "page-content-wrapper",
"options": {
"title": "Calcul d'isochrone",
"isochroneUrl": "https://wxs.ign.fr/essentiels/geoportail/isochrone/rest/1.0.0/isochrone?",
"isochroneUrl": "https://data.geopf.fr/navigation/isochrone?",
"isohroneColor": "#b45793"
}
}
2 changes: 1 addition & 1 deletion demo/addons/isochroneAddon/isochroneAddon.js
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ const isochroneAddon = (function () {
var url = mviewer.customComponents["isochroneAddon"].config.options.isochroneUrl;

var dataParameters = {
resource: "bdtopo-iso",
resource: "bdtopo-valhalla",
point: _xy.join(","),
profile: mode,
};
Expand Down
4 changes: 2 additions & 2 deletions demo/catalogue/data.json
Original file line number Diff line number Diff line change
Expand Up @@ -407,7 +407,7 @@
"url_demo": "../?config=demo/api.xml"
},
{
"id": "47",
"id": "48",
"title": "Affichage COG / TIFF",
"tags": "cog,tiff,raster,custom,ndvi,reprojection",
"description": "Affichage d'un COG, d'un COG NDVI+NDWI (style avec classes OpenLayers) et d'un fichier TIFF reprojeté à la volée avec interrogation du pixel",
Expand All @@ -416,7 +416,7 @@
"url_demo": "../?config=demo/cog-geotiff/cog.xml"
},
{
"id": "48",
"id": "49",
"title": "Mise en page personnalisée",
"tags": "print,impression,layout",
"description": "Mise en page d'une carte avec le module externe (addon) d'impression.",
Expand Down
4 changes: 2 additions & 2 deletions demo/cog-geotiff/cog.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<baselayer visible="false" id="ortho1" thumbgallery="img/basemap/ortho.jpg" title="GéoBretagne" label="Photo aérienne GéoBretagne" type="WMTS" url="https://tile.geobretagne.fr/gwc02/service/wmts" layers="satellite" format="image/jpeg" style="_null" matrixset="EPSG:3857" fromcapacity="false" attribution="&lt;a href='https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/3a0ac2e3-7af1-4dec-9f36-dae6b5a8c731' target='_blank' >Partenaires GéoBretagne - IGN&lt;/a>"/>
<baselayer type="WMS" id="photo2" label="Photo aérienne GéoBretagne 1950" title="GéoBretagne" thumbgallery="img/basemap/ortho-ancien.jpg" url="https://tile.geobretagne.fr/gwc02/service/wms" layers="satellite-ancien" format="image/jpeg" visible="false" attribution="&lt;a href='https://geobretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/048622c5-b333-4c2b-94ec-40a41608dc06' target='_blank' >Partenaires GéoBretagne - IGN&lt;/a>"/>
<baselayer visible="false" type="WMTS" id="ortho_ir" label="Photo aérienne infra rouge" title="GéoBretagne" thumbgallery="img/basemap/ir.jpg" url="https://geobretagne.fr/geoserver/gwc/service/wmts" layers="photo:ir-composite" format="image/jpeg" style="_null" matrixset="EPSG:3857" fromcapacity="false" attribution="&lt;a href='https://geobretagne.fr/geonetwork/apps/georchestra/?uuid=434b82a8-8d3c-4d9f-9eb3-0485f1a63eb6' target='_blank' >Partenaires GéoBretagne - IGN &lt;/a>" />
<baselayer type="WMTS" id="ortho2" label="Photo aérienne IGN" title="GéoPortail" maxscale="1000" thumbgallery="img/basemap/ortho.jpg" url="https://wxs.ign.fr/essentiels/geoportail/wmts" layers="ORTHOIMAGERY.ORTHOPHOTOS" format="image/jpeg" visible="false" fromcapacity="false" attribution="&lt;a href='https://geoservices.ign.fr/services-web-decouverte' target='_blank'>&lt;img src='img/basemap/geoservices.png'>&lt;/a>" style="normal" matrixset="PM" maxzoom="22"/>
<baselayer type="WMTS" id="plan" label="Plan IGN" title="GéoPortail" maxscale="2000" thumbgallery="img/basemap/plan_ign.png" opacity="0.8" url="https://wxs.ign.fr/decouverte/geoportail/wmts" layers="GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" format="image/png" visible="false" fromcapacity="false" attribution="&lt;a href='https://geoservices.ign.fr/services-web-decouverte' target='_blank'>&lt;img src='img/basemap/geoservices.png'>&lt;/a>" style="normal" matrixset="PM" maxzoom="22"/>
<baselayer type="WMTS" id="ortho2" label="Photo aérienne IGN" title="GéoPortail" maxscale="1000" thumbgallery="img/basemap/ortho.jpg" url="https://data.geopf.fr/wmts" layers="ORTHOIMAGERY.ORTHOPHOTOS" format="image/jpeg" visible="false" fromcapacity="false" attribution="&lt;a href='https://geoservices.ign.fr/services-web-decouverte' target='_blank'>&lt;img src='img/basemap/geoservices.png'>&lt;/a>" style="normal" matrixset="PM" maxzoom="22"/>
<baselayer type="WMTS" id="plan" label="Plan IGN" title="GéoPortail" maxscale="2000" thumbgallery="img/basemap/plan_ign.png" opacity="0.8" url="https://data.geopf.fr/wmts" layers="GEOGRAPHICALGRIDSYSTEMS.PLANIGNV2" format="image/png" visible="false" fromcapacity="false" attribution="&lt;a href='https://geoservices.ign.fr/services-web-decouverte' target='_blank'>&lt;img src='img/basemap/geoservices.png'>&lt;/a>" style="normal" matrixset="PM" maxzoom="22"/>
<baselayer type="fake" id="fake" label="Carroyage" title="Carroyage" thumbgallery="img/basemap/grid.png" visible="false" />
</baselayers>
<proxy url=""/>
Expand Down
19 changes: 1 addition & 18 deletions demo/fonds.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,23 +61,6 @@
style="pci"
url="https://data.geopf.fr/tms/1.0.0/PCI/{z}/{x}/{y}.pbf">
</layer>
<layer
id="bdtopo"
name="BD TOP"
visible="true"
type="vector-tms"
opacity="0.9"
queryable="true"
tilesize="1"
filterstyle=""
styleurl="https://wxs.ign.fr/static/vectorTiles/styles/BDTOPO/bati.json"
infopanel="right-panel"
legendurl="demo/lycee.png"
metadata="https://geoservices.ign.fr/services-web-essentiels"
attribution="Source: IGN"
style="bdtopo"
url="https://data.geopf.fr/tms/1.0.0/BDTOPO/{z}/{x}/{y}.pbf">
</layer>
</theme>
</theme>
</themes>
</config>
160 changes: 160 additions & 0 deletions demo/sensor.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,160 @@
<?xml version="1.0" encoding="UTF-8"?>
<config>
<application title="Mviewer" mouseposition="false" logo="" help="mviewer_help.html" measuretools="true" exportpng="true" style="css/themes/wet_asphalt.css" togglealllayersfromtheme="true"/>
<extensions>
<extension type="javascript" src="lib/chartjs-3.7.1/Chart.min.js" usededby="cad.js"/>
</extensions>
<mapoptions maxzoom="19" projection="EPSG:3857" center="-220750.13768758904,6144925.57790189" zoom="8" projextent="-20037508.342789244, -20037508.342789244, 20037508.342789244, 20037508.342789244" />

<baselayers style="gallery">
<baselayer type="OSM" id="positron" label="Positron" title="Carto" thumbgallery="img/basemap/positron.png"
url="http://{a-c}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png" maxzoom="20"
visible="true" attribution="Map tiles by &lt;a href='https://carto.com/attributions' target='_blank'>Carto &lt;/a>, under &lt;a href='https://creativecommons.org/licenses/by/3.0/' target='_blank'>CC BY 3.0 &lt;/a>" />
<baselayer type="OSM" id="osm1" label="OpenStreetMap" title="OpenStreetMap" thumbgallery="img/basemap/osm.png"
url="http://{a-c}.tile.openstreetmap.org/{z}/{x}/{y}.png"
attribution="© MapQuest. Données : les contributeurs d'&lt;a href='https://www.openstreetmap.org/' target='_blank'>OpenStreetMap &lt;/a>, &lt;a href='https://www.openstreetmap.org/copyright' target='_blank'>ODbL &lt;/a>" visible="false"/>
<baselayer visible="false" id="osm_google"
thumbgallery="img/basemap/osm_google.png" title="GéoBretagne" label="OpenStreetMap GéoBretagne" type="WMS" url="https://osm.geobretagne.fr/gwc01/service/wms" layers="osm:google" format="image/png"
attribution="GéoBretagne. Données : les contributeurs d'&lt;a href='https://www.openstreetmap.org/' target='_blank'>OpenStreetMap &lt;/a>, &lt;a href='https://www.openstreetmap.org/copyright' target='_blank'>ODbL &lt;/a>"/>
</baselayers>
<proxy url=""/>
<olscompletion url="https://api-adresse.data.gouv.fr/search/" type="ban" attribution="La recherche d'adresse est un service proposé par la BAN"/>
<searchparameters bbox="false" localities="true" features="false" />

<themes>
<theme name="Population" collapsed="false" id="habitant" icon="fas fa-users">
<layer id="rp_struct_pop_geom" name="Densité de population (hab/km²)" visible="false" tiled="false"
searchable="false" queryable="true"
attributefilter="true" attributefield="level" attributevalues="Commune,EPCI,Pays" attributelabel="Échelle" attributestylesync="true" attributefilterenabled="true"
infopanel="bottom-panel"
infoformat="application/vnd.ogc.gml" featurecount="5"
timefilter="true" timeinterval="year" timecontrol="slider" timemin="1999" timemax="2017" timevalues="1999,2007,2012,2017"
style="rphab_densite@commune"
stylesalias=""
url="https://ows.region-bretagne.fr/geoserver/rb/wms"
attribution="Sources: INSEE (RP) - OpenStreetMap | Traitements: Région Bretagne - Service connaissance, observation, planification et prospective"
metadata="https://kartenn.region-bretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/26324529-e0b7-450c-9506-2dcdca608f5f"
metadata-csw="https://kartenn.region-bretagne.fr/geonetwork/srv/eng/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID=26324529-e0b7-450c-9506-2dcdca608f5f">
<template url="https://kartenn.region-bretagne.fr/kartoviz/apps/region/territoire/templates/territoire.pop.densite.mst"></template>
</layer>
<layer id="rp_struct_pop_geom" name="Part de la population selon la catégorie d'âge (%)" visible="false" tiled="false"
searchable="false" queryable="true"
attributefilter="true" attributefield="level" attributevalues="Commune,EPCI,Pays" attributelabel="Échelle" attributestylesync="true" attributefilterenabled="true"
infopanel="bottom-panel"
infoformat="application/vnd.ogc.gml" featurecount="5"
timefilter="true" timeinterval="year" timecontrol="slider" timemin="1999" timemax="2017" timevalues="1999,2007,2012,2017"
style="rphab_tx0014@commune, rphab_tx1529@commune, rphab_tx3044@commune, rphab_tx4559@commune, rphab_tx6074@commune, rphab_tx75p@commune"
styletitle="Catégories d'âge"
stylesalias="0 - 14 ans, 15 -29 ans, 30 - 44 ans, 45 - 59 ans, 60 -74 ans, 75 ans et plus "
url="https://ows.region-bretagne.fr/geoserver/rb/wms"
attribution="Sources: INSEE (RP) - OpenStreetMap | Traitements: Région Bretagne - Service connaissance, observation, planification et prospective"
metadata="https://kartenn.region-bretagne.fr/geonetwork/srv/fre/catalog.search#/metadata/26324529-e0b7-450c-9506-2dcdca608f5f"
metadata-csw="https://kartenn.region-bretagne.fr/geonetwork/srv/eng/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID=26324529-e0b7-450c-9506-2dcdca608f5f">
<template url="https://kartenn.region-bretagne.fr/kartoviz/apps/region/territoire/templates/territoire.pop.cat_age.mst"></template>
</layer>
<layer id="lycee"
name="Lycées en Bretagne"
type="customlayer"
vectorlegend="true"
url="customlayers/lycee.js"
metadata="https://geobretagne.fr/geonetwork/apps/georchestra/?uuid=99e78163-ce9a-4eee-9ea0-36afc2a53d25"
metadata-csw="https://geobretagne.fr/geonetwork/srv/fre/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID&amp;ID=99e78163-ce9a-4eee-9ea0-36afc2a53d25"
queryable="true"
fields="nom,adresse,photo"
aliases="Nom,Adresse,Photo"
visible="true"
searchable="true"
searchengine="fuse"
fusesearchkeys="nom,adresse"
fusesearchresult="{{nom}} ({{type_etabl}})"
attribution="Région Bretagne" />
</theme>
<theme id="sensors" name="Capteurs">
<layer
id="agricast"
type="sensorthings"
name="API Geosas"
infopanel="bottom-panel"
visible="true"
legendurl="false"
queryable="true"
url="https://api.geosas.fr/agri4cast/v1.0"
style="sensorPolygon"
top="2000"
defaultSensor=""
selector="id,description"
datastreamsfilter="name,id"
multidatastreamsfilter="name,description,id,unitOfMeasurements">
<template url="demo/sensorGeosas.mst"></template>
</layer>
<layer
id="lora"
type="sensorthings"
name="API Lora"
visible="true"
legendurl="false"
queryable="true"
url="https://api.geosas.fr/lora/v1.0"
infopanel="bottom-panel"
style="sensorPoint"
top="200"
defaultSensor="ETP"
selector="id,description"
datastreamsfilter="name,id"
multidatastreamsfilter="name,description,id,unitOfMeasurements">
<template url="demo/sensorLora.mst"></template>
</layer>
</theme>
<theme name="Transports" collapsed="false" id="transport" icon="fas fa-bus">
<group name="Transport ferroviaire" id="grp1" >
<layer id="ligne_ferroviaire" name="Lignes ferroviaires" visible="false" tiled="true"
queryable="false"
sld="https://kartenn.region-bretagne.fr/kartoviz/apps/region/transport/ligne_ferroviaire.sld"
style="ligne_ferroviaire"
infoformat="application/vnd.ogc.gml" featurecount="20"
url="https://geobretagne.fr/geoserver/sncf/wms"
attribution="SNCF réseau"
metadata="https://geobretagne.fr/geonetwork/srv/eng/catalog.search?node=srv#/metadata/b8927600-5b49-11de-b5dc-0000c0a8230c"
metadata-csw="https://geobretagne.fr/geonetwork/srv/eng/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID=b8927600-5b49-11de-b5dc-0000c0a8230c">
</layer>
<layer id="arret_ferroviaire" name="Arrêts ferroviaires régionaux" visible="false" tiled="false"
searchable="true" queryable="true" fields="" aliases=""
infoformat="application/vnd.ogc.gml" featurecount="20"
style="arret_ferroviaire_defaut, arret_ferroviaire_nature"
stylesalias="Par défaut,Nature des arrêts ferroviaires"
legendurl="https://kartenn.region-bretagne.fr/doc/icons_region/gare_ter.svg"
url="https://ows.region-bretagne.fr/geoserver/rb/wms"
attribution="Source: Région Bretagne"
metadata="https://kartenn.region-bretagne.fr/geonetwork/?uuid=4a9d13f7-17be-4a98-9f8f-907cf223072f"
metadata-csw="https://kartenn.region-bretagne.fr/geonetwork/srv/eng/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID=4a9d13f7-17be-4a98-9f8f-907cf223072f" >
<template url="https://kartenn.region-bretagne.fr/kartoviz/apps/region/global/templates/global.arret_ferroviaire.mst"></template>
</layer>
</group>
<group name="Transport maritime" id="grp2" >
<layer id="gare_maritime" name="Gares maritimes" visible="false" tiled="false"
searchable="false" queryable="true" fields="axe" aliases="axe"
infoformat="application/vnd.ogc.gml" featurecount="20"
sld="https://kartenn.region-bretagne.fr/styles/gare_maritime.sld"
url="https://geobretagne.fr/geoserver/dreal_b/ows"
legendurl="https://kartenn.region-bretagne.fr/doc/icons_region/gare_maritime.svg"
attribution="Source: DREAL Bretagne"
metadata="https://geobretagne.fr/geonetwork/apps/georchestra/?uuid=ffcb4e72-a01b-44f0-8da3-95a5b13c6e42"
metadata-csw="https://geobretagne.fr/geonetwork/srv/eng/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID=ffcb4e72-a01b-44f0-8da3-95a5b13c6e42" >
<template url="https://kartenn.region-bretagne.fr/kartoviz/apps/region/global/templates/global.gare_maritime.mst"></template>
</layer>
<layer id="port" name="Ports" visible="false" tiled="false"
searchable="false" queryable="true" fields="axe" aliases="axe"
infoformat="application/vnd.ogc.gml" featurecount="20"
sld="https://kartenn.region-bretagne.fr/styles/port.sld"
url="https://ows.region-bretagne.fr/geoserver/rb/wms"
legendurl="https://kartenn.region-bretagne.fr/doc/icons_region/port.svg"
attribution="Source: Région Bretagne"
metadata="https://geobretagne.fr/geonetwork/apps/georchestra/?uuid=c55c4fba-6a37-48ea-8754-a1bf770a684b"
metadata-csw="https://geobretagne.fr/geonetwork/srv/eng/csw?SERVICE=CSW&amp;VERSION=2.0.2&amp;REQUEST=GetRecordById&amp;elementSetName=full&amp;ID=c55c4fba-6a37-48ea-8754-a1bf770a684b" >
<template url="https://kartenn.region-bretagne.fr/kartoviz/apps/region/global/templates/global.port.mst"></template>
</layer>
</group>
</theme>

</themes>
</config>
Loading

0 comments on commit c567710

Please sign in to comment.