Skip to content

Commit

Permalink
release-ol-3.2.8
Browse files Browse the repository at this point in the history
  • Loading branch information
elias75015 committed Feb 15, 2022
2 parents 25634bc + 180a5ca commit aedbd98
Show file tree
Hide file tree
Showing 79 changed files with 14,813 additions and 609 deletions.
47 changes: 39 additions & 8 deletions DRAFT_CHANGELOG.md
Expand Up @@ -7,24 +7,57 @@
## Summary

Evolution de la documentation et correction du layerswitcher
* fonctionnalités sur l'outil de dessins
* gestion des styles sur les formats GPX et GeoJSON
* gestion des evenements de fin de traitements sur les widgets

## Changelog

* [Added]

- gestion des geometries de type *Multi* dans l'outil de dessins
- ajout de l'export au format GPX et GeoJSON dans l'outil de dessins
- gestion des styles au format GPX et GeoJSON (specification MapBox)
- ajoute d'evenements et de callback de fin de traitement pour les widgets ElevationPath, Route, IsoCurve, SearchEngine et ReverseGeocode.
```js
// Exemple
var iso = new ol.control.Isocurve({
isocurveOptions : {
// utilisation de la callback du service
onSuccess : function(e) {
console.warn("Resultat du calcul", e);
// {
// distance: null
// geometry: {type: 'Polygon', coordinates: Array(1)}
// id: null
// location: {x: '2.8926909677185058', y: '48.76818760957548'}
// message: null
// srs: "EPSG:4326"
// time: "3600"
// }
},
onFailure : function(e) {
console.warn(e);
}
}
});
// ou utilisation de l'evenement du widget
iso.on("isocurve:compute", function (e) {
// interface : getData()
console.warn(e.target.getData());
});
```

* [Changed]

- Mise à jour de la documentation pour l'utilisation de clefs multiples (#318)
- Retrait de la limitation d'affichage des reponses de l'autocompletion sur le Widget *SearchEngine* (cf. <https://www.developpez.net/forums/d2125691/applications/sig-systeme-d-information-geographique/ign-api-geoportail/geoportal-extension-searchengine-autocomplete-maximum-5-reponses/#post11811536>)

* [Deprecated]

* [Removed]

* [Fixed]

- Correction du drag&drop sur le LayerSwitcher sous Chrome 97 (138aecced48a3f91503b6d3ec33e917d4cb16e04)

* [Security]

---
Expand All @@ -42,14 +75,14 @@ Evolution de la documentation et correction du layerswitcher

* [Changed]

- Mise à jour de la documentation pour l'utilisation de clefs multiples (#318)

* [Deprecated]

* [Removed]

* [Fixed]

- Correction des paramètres passés aux couches WMTS/WMS (#319)

* [Security]

---
Expand All @@ -67,8 +100,6 @@ Evolution de la documentation et correction du layerswitcher

* [Changed]

- Mise à jour de la documentation pour l'utilisation de clefs multiples (#318)

* [Deprecated]

* [Removed]
Expand Down
15 changes: 8 additions & 7 deletions README.md
@@ -1,10 +1,14 @@
# Extensions Géoportail

![image](capture-carte.png)

---

[![Build](https://github.com/IGNF/geoportal-extensions/actions/workflows/build.yml/badge.svg)](https://github.com/IGNF/geoportal-extensions/actions/workflows/build.yml)
[![CeCILL License](https://img.shields.io/badge/licence-CeCILL--B-blue.svg)](https://raw.githubusercontent.com/IGNF/geoportal-extensions/master/LICENCE.md)
[![DeepScan grade](https://deepscan.io/api/teams/12425/projects/15469/branches/309621/badge/grade.svg)](https://deepscan.io/dashboard#view=project&tid=12425&pid=15469&bid=309621)

Ce projet a pour but de fournir des extensions facilitant l'accès aux ressources de la plateforme Géoportail pour les bibliothèques cartographiques Leaflet, OpenLayers (versions 3 et supérieures) et iTowns.
Ce projet a pour but de fournir des extensions facilitant l'accès aux ressources de la plateforme [Géoportail](https://www.geoportail.gouv.fr/) pour les bibliothèques cartographiques [Leaflet](https://leafletjs.com/), [OpenLayers](https://openlayers.org/) (versions 3 et supérieures) et [iTowns](http://www.itowns-project.org/).

Ces extensions proposent des classes et widgets utilisables en complément de la bibliothèque cartographique qu'elles étendent, permettant notamment :

Expand All @@ -22,16 +26,13 @@ Ces extensions proposent des classes et widgets utilisables en complément de la

* ...

## LEAFLET

## <img src="leaflet.svg" height="15px" /> LEAFLET
Voir le détail des [fonctionnalités proposées par l'extension Géoportail pour Leaflet](doc/README-leaflet.md)


## OPENLAYERS
## <img src="openlayers.svg" height="15px" /> OPENLAYERS

Voir le détail des [fonctionnalités proposées par l'extension Géoportail pour OpenLayers](doc/README-openlayers.md)


## ITOWNS
## <img src="threedotjs.svg" height="15px" /> ITOWNS

Voir le détail des [fonctionnalités proposées par l'extension Géoportail pour iTowns](doc/README-itowns.md)
24 changes: 12 additions & 12 deletions TEAM_DEV_WORKFLOW.md
Expand Up @@ -222,13 +222,13 @@ Les "gros" bug fixes ou refacto sont à considérer comme des features: c'est à

~~~
git checkout develop
git checkout -b release-X.Y.Z
git push origin release-X.Y.Z
git checkout -b release-[ol|leaflet|itowns]-X.Y.Z
git push origin release-[ol|leaflet|itowns]-X.Y.Z
~~~

2 - Sur cette branche, modifier le package.json pour incrémenter numéro de version et la date
2 - Sur cette branche, modifier le *package.json* pour incrémenter numéro de version et la date

3 - Réaliser sur cette branche release les tests habituels liés à la publication d'une release (npm run test, npm run sample:serve)
3 - Réaliser sur cette branche release les tests habituels liés à la publication d'une release (`npm run test`, `npm run sample:serve`)

4 - Si on trouve des bugs, on les corrige directement sur cette branche release (plusieurs membres de l'équipe peuvent réaliser les verifications/corrections en parrallèle sur la branche release)

Expand All @@ -240,31 +240,31 @@ git commit --> "fix(scope) : corrige le probleme"

~~~
git checkout develop
git merge release-X.Y.Z
git merge release-[ol|leaflet|itowns]-X.Y.Z
~~~

6 - On recommence autant de fois que necessaire les etapes 4 et 5

7 - Quand on estime que tout est ok, on prépare la future publication npm en construisant les binaires :
* vérifier date et version dans les package.json
* vérifier que le DRAFT_CHANGELOG est à jour
* vérifier que le `DRAFT_CHANGELOG` est à jour
* pousser la branch

8 - Quand on estime que la release est OK, on merge la branche sans fast-forward sur **develop**
8 - Quand on estime que la release est OK, on merge la branche *sans fast-forward* sur **develop**

~~~
git checkout develop
git merge release-X.Y.Z --no-ff
git merge release-[ol|leaflet|itowns]-X.Y.Z --no-ff
~~~

9 - Quand on estime que la release est OK, on merge la branche sans fast-forward sur **master** et on tag la version sur master
9 - Quand on estime que la release est OK, on merge la branche *sans fast-forward* sur **master** et on tag la version sur master

~~~
git checkout master
git merge release-X.Y.Z --no-ff
git merge release-[ol|leaflet|itowns]-X.Y.Z --no-ff
~~~

**Renommer le commit "release sdk-X.Y.Z" ou "release ext-ol-X.Y.Z"**
> **Renommer le commit "release sdk-X.Y.Z" ou "release ext-ol-X.Y.Z"**
10 - On supprime la branche release ainsi mergée

Expand All @@ -285,7 +285,7 @@ git push origin ol-X.Y.Z
* vérifier page de publication de la release npm
* vérifier que la jsdoc (gh-pages) est à jour
* vérifier que le projet exemples a été mis à jour avec la nouvelle release (par ex. https://github.com/IGNF/geoportal-access-lib-samples)
* vérifier que le DRAFT_CHANGELOG a été vidé et que le CHANGELOG a été mis à jour
* vérifier que le `DRAFT_CHANGELOG` a été vidé et que le CHANGELOG a été mis à jour


## Realisation d'un hotfix
Expand Down
12 changes: 6 additions & 6 deletions build/jsdoc/README-openlayers.md
@@ -1,6 +1,6 @@
# Geoportal Extension for OpenLayers API Reference

The Geoportal Extension for OpenLayers provides additionnal javascript functionalities (Sources, Layers and Controls) making access to french geoportal webservices easier when using <a href="http://openlayers.org/">OpenLayers</a> javascript library.
The Geoportal Extension for OpenLayers provides additionnal javascript functionalities (Sources, Layers and Controls) making access to french geoportal webservices easier when using <a href="https://openlayers.org/">OpenLayers</a> javascript library.

This extension is not standalone and has to be used **together with OpenLayers** library. In a web page, you thus have to include both OpenLayers and Geoportal Extension resources. For instance :

Expand All @@ -22,7 +22,7 @@ NB : to have complete access to this extension functionnalities, you need to pro

## Geoportal Sources

Sources provided by the Geoportal Extension are additionnal <a href="http://openlayers.org/en/latest/apidoc/ol.source.html">OpenLayers Sources</a> that give simple access to Geoportal data that can then be used to feed <a href="http://openlayers.org/en/latest/apidoc/ol.layer.html">OpenLayers layers</a>.
Sources provided by the Geoportal Extension are additionnal <a href="https://openlayers.org/en/latest/apidoc/module-ol_source_Source-Source.html">OpenLayers Sources</a> that give simple access to Geoportal data that can then be used to feed <a href="https://openlayers.org/en/latest/apidoc/module-ol_layer_Layer-Layer.html">OpenLayers layers</a>.


| Geoportal Source | Description |
Expand All @@ -33,7 +33,7 @@ Sources provided by the Geoportal Extension are additionnal <a href="http://open

## Geoportal Layers

Layers provided by the Geoportal Extension are additionnal <a href="http://openlayers.org/en/latest/apidoc/ol.layer.html">OpenLayers layers</a> already connected to previous [Geoportal Extension sources](#sources) that can be added to an <a href="http://openlayers.org/en/latest/apidoc/ol.Map.html">OpenLayers Map</a> like any other OpenLayers layer.
Layers provided by the Geoportal Extension are additionnal <a href="https://openlayers.org/en/latest/apidoc/module-ol_layer_Layer-Layer.html">OpenLayers layers</a> already connected to previous [Geoportal Extension sources](#sources) that can be added to an <a href="https://openlayers.org/en/latest/apidoc/module-ol_Map-Map.html">OpenLayers Map</a> like any other OpenLayers layer.

| Geoportal Layer | Description |
| - | - |
Expand All @@ -43,13 +43,13 @@ Layers provided by the Geoportal Extension are additionnal <a href="http://openl

## Geoportal Controls

Controls provided by the Geoportal Extension are additionnal <a href="http://openlayers.org/en/latest/apidoc/ol.control.html">OpenLayers controls</a> that, when added to an <a href="http://openlayers.org/en/latest/apidoc/ol.Map.html">OpenLayers Map</a>, allows user to interact with it.
Controls provided by the Geoportal Extension are additionnal <a href="https://openlayers.org/en/latest/apidoc/module-ol_control_Control-Control.html">OpenLayers controls</a> that, when added to an <a href="https://openlayers.org/en/latest/apidoc/module-ol_Map-Map.html">OpenLayers Map</a>, allows user to interact with it.

| Geoportal Control | Description |
| - | - |
| {@link ol.control.GeoportalAttribution ol.control.GeoportalAttribution} | Is a substitute for <a href="http://openlayers.org/en/latest/apidoc/ol.control.Attribution.html">built in ol.control.Attribution</a>. It has the additionnal capability of handling geoportal dynamic attributions depending on zoom level and positionning of the map. |
| {@link ol.control.GeoportalAttribution ol.control.GeoportalAttribution} | Is a substitute for <a href="https://openlayers.org/en/latest/apidoc/module-ol_control_Attribution-Attribution.html">built in ol.control.Attribution</a>. It has the additionnal capability of handling geoportal dynamic attributions depending on zoom level and positionning of the map. |
| {@link ol.control.LayerSwitcher ol.control.LayerSwitcher} | Allows users to manage layer organisation of the map |
| {@link ol.control.GeoportalMousePosition ol.control.GeoportalMousePosition} | Is a substitute for <a href="http://openlayers.org/en/latest/apidoc/ol.control.MousePosition.html">built in ol.control.MousePosition</a>. It has the additionnal capability of displaying elevation of Mouse Position based on <a href="https://geoservices.ign.fr/documentation/geoservices/alti.html">elevation service of the Geoportal Platform</a>. |
| {@link ol.control.GeoportalMousePosition ol.control.GeoportalMousePosition} | Is a substitute for <a href="https://openlayers.org/en/latest/apidoc/module-ol_control_MousePosition-MousePosition.html">built in ol.control.MousePosition</a>. It has the additionnal capability of displaying elevation of Mouse Position based on <a href="https://geoservices.ign.fr/documentation/geoservices/alti.html">elevation service of the Geoportal Platform</a>. |
| {@link ol.control.SearchEngine ol.control.SearchEngine} | Allows users to search and display locations on a map using <a href="https://geoservices.ign.fr/documentation/geoservices/autocompletion.html">autocompletion service</a> and <a href="https://geoservices.ign.fr/documentation/geoservices/geocodage.html">geocoding service</a> of the Geoportal Platform. |
| {@link ol.control.ReverseGeocode ol.control.ReverseGeocode} | Allows users to find locations by clicking on a map using <a href="https://geoservices.ign.fr/documentation/geoservices/geocodage-inverse.html">geocoding service</a> of the Geoportal Platform. |
| {@link ol.control.Route ol.control.Route} | Allows users to compute and display routes on a Map using <a href="https://geoservices.ign.fr/documentation/geoservices/itineraires.html">routing service</a> of the Geoportal Platform. |
Expand Down
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
52 changes: 26 additions & 26 deletions build/scripts/release/package-itowns.json
@@ -1,44 +1,44 @@
{
"bundleDependencies" : [],
"version" : "2.3.4",
"main" : "dist/GpPluginItowns-src.js",
"repository" : {
"url" : "https://github.com/IGNF/geoportal-extensions.git",
"type" : "git"
},
"directories" : {},
"bugs" : {},
"bundleDependencies" : [],
"peerDependencies" : {},
"homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
"dependencies" : {
"itowns" : "2.33.0",
"xmldom" : "^0.1.27",
"loglevel" : "1.6.6",
"three" : "0.127.0",
"proj4" : "2.7.2",
"node-fetch" : "^2.6.1",
"geoportal-access-lib" : "3.0.5",
"proj4" : "2.7.2",
"itowns" : "2.33.0",
"sortablejs" : "1.8.4",
"loglevel" : "1.6.6",
"three" : "0.127.0"
"sortablejs" : "1.8.4"
},
"module" : "src/Itowns/index.js",
"license" : "CECILL-B",
"devDependencies" : {},
"scripts" : {},
"date" : "03/12/2021",
"version" : "2.3.5",
"keywords" : [
"geoportail",
"plugin",
"javascript",
"Itowns"
],
"repository" : {
"type" : "git",
"url" : "https://github.com/IGNF/geoportal-extensions.git"
},
"author" : "IGNF",
"files" : [
"dist/",
"src/",
"LICENCE.md",
"README.md",
"package.json"
],
"peerDependencies" : {},
"bugs" : {},
"devDependencies" : {},
"keywords" : [
"geoportail",
"plugin",
"javascript",
"Itowns"
],
"date" : "28/01/2022",
"module" : "src/Itowns/index.js",
"description" : "French Geoportal Extensions for iTowns",
"directories" : {},
"homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-itowns.html",
"name" : "geoportal-extensions-itowns",
"author" : "IGNF"
"license" : "CECILL-B"
}
57 changes: 28 additions & 29 deletions build/scripts/release/package-leaflet.json
@@ -1,46 +1,45 @@
{
"directories" : {},
"dependencies" : {
"node-fetch" : "^2.6.1",
"proj4leaflet" : "1.0.2",
"loglevel" : "1.6.6",
"geoportal-access-lib" : "3.0.5",
"sortablejs" : "1.8.4",
"xmldom" : "^0.1.27",
"leaflet-draw" : "1.0.4",
"proj4" : "2.7.2",
"leaflet" : "1.7.1"
},
"name" : "geoportal-extensions-leaflet",
"peerDependencies" : {},
"devDependencies" : {},
"bugs" : {},
"files" : [
"dist/",
"src/",
"LICENCE.md",
"README.md",
"package.json"
],
"module" : "src/Leaflet/index.js",
"scripts" : {},
"peerDependencies" : {},
"bundleDependencies" : [],
"main" : "dist/GpPluginLeaflet-src.js",
"directories" : {},
"dependencies" : {
"node-fetch" : "^2.6.1",
"xmldom" : "^0.1.27",
"proj4" : "2.7.2",
"leaflet-draw" : "1.0.4",
"loglevel" : "1.6.6",
"sortablejs" : "1.8.4",
"leaflet" : "1.7.1",
"proj4leaflet" : "1.0.2",
"geoportal-access-lib" : "3.0.5"
},
"description" : "French Geoportal Extension for Leaflet",
"date" : "03/12/2021",
"homepage" : "https://geoservices.ign.fr/documentation/utilisation_web/extension-leaflet.html",
"devDependencies" : {},
"version" : "2.2.1",
"repository" : {
"type" : "git",
"url" : "https://github.com/IGNF/geoportal-extensions.git"
},
"license" : "CECILL-B",
"keywords" : [
"geoportail",
"plugin",
"javascript",
"leaflet",
"publish"
],
"name" : "geoportal-extensions-leaflet",
"author" : "IGNF",
"bugs" : {}
"module" : "src/Leaflet/index.js",
"scripts" : {},
"bundleDependencies" : [],
"description" : "French Geoportal Extension for Leaflet",
"main" : "dist/GpPluginLeaflet-src.js",
"repository" : {
"type" : "git",
"url" : "https://github.com/IGNF/geoportal-extensions.git"
},
"date" : "28/01/2022",
"version" : "2.2.2",
"license" : "CECILL-B"
}

0 comments on commit aedbd98

Please sign in to comment.