release-3.3.26

IGNF · Jun 1, 2023 · e522db2 · e522db2
2 parents 7006dc0 + 87d0c2c
commit e522db2
Show file tree

Hide file tree

Showing 9 changed files with 298 additions and 111 deletions.
diff --git a/DRAFT_CHANGELOG.md b/DRAFT_CHANGELOG.md
@@ -6,20 +6,52 @@
 
 ## Summary
 
-Corrections styles couches COMPUTE et imports
+- Option d'export et import des couches de calcul
 
 ## Changelog
 
 * [Added]
 
+    - Option d'export des tracés et des calculs au format GPX, KML et GeoJSON sur les contôles d'itineraire, d'isochrone et de profil altimétrique (#105):
+
+        ```js
+            Gp.Map.load('map', {
+                configUrl : ,
+                azimuth : ,
+                zoom : ,
+                center : {},
+                layersOptions : {},
+                controlsOptions : {
+                    route : {
+                        export : true
+                    },
+                    isocurve : {
+                        export : {
+                            format : "gpx",
+                            name : "export-iso",
+                            title : "Exporter",
+                            menu : true
+                        }
+                    },
+                    elevationPath : {
+                        export : false
+                    }
+                }
+            });
+        ```
+
+    - Imports des couches de calculs (itineraire, isochrone et profil altimétrique) au format GPX, KML et GeoJSON (#105).
+
 * [Changed]
 
+    - Mise à jour de l'extension geoportail pour itowns en version 2.3.11
+    - Mise à jour de l'extension geoportail pour openlayers en version 3.2.22 (#105)
+
 * [Removed]
 
 * [Fixed]
 
-    - fix sur le styles des couches COMPUTE (6c2f07f7a743825ce52fd7c0093941d5dd2ac8eb)
-    - fix import KML (e3ff993104854c45a87e71b702a40c42f0d2479d et 450e32de52b60624a22f6d60ddc11b0c57116d38)
+    - Correction du passage des options du service d'alti pour le controle de profil altimetrique (#104)
 
 * [Deprecated]
 

diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
     "name": "geoportal-sdk",
-    "version": "3.3.25",
-    "date": "03/04/2023",
-    "SDK2DVersion": "3.3.25",
-    "SDK3DVersion": "3.3.25",
+    "version": "3.3.26",
+    "date": "01/06/2023",
+    "SDK2DVersion": "3.3.26",
+    "SDK3DVersion": "3.3.26",
     "description": "French Geoportal SDK based on OpenLayers (2D) and iTowns (3D) libraries",
     "main": "dist/2d/GpSDK2D-src.js, dist/3d/GpSDK3d-src.js",
     "module": "src/SDK2D.js, src/SDK3D.js",
@@ -72,8 +72,8 @@
         "exports-loader": "^0.7.0",
         "expose-loader": "^0.7.5",
         "fs-extra": "^9.0.0",
-        "geoportal-extensions-itowns": "2.3.10",
-        "geoportal-extensions-openlayers": "3.2.21",
+        "geoportal-extensions-itowns": "2.3.11",
+        "geoportal-extensions-openlayers": "3.2.22",
         "handlebars": "^4.7.5",
         "handlebars-layouts": "^3.1.4",
         "html-webpack-plugin": "^4.0.4",

diff --git a/samples-src/pages/2d/page-controlsOptions-bundle.html b/samples-src/pages/2d/page-controlsOptions-bundle.html
@@ -109,6 +109,7 @@ <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de
                 route : {
                     // div : "extControlDiv",
                     // maximised : true,
+                    export : true,
                     exclusions : {
                         toll : true,
                         bridge : false,
@@ -125,6 +126,12 @@ <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de
                 isocurve : {
                     // div : "extControlDiv",
                     // maximised : true,
+                    export : {
+                        format : "gpx",
+                        name : "export-iso",
+                        title : "Exporter",
+                        menu : true
+                    },
                     exclusions : {
                         toll : true,
                         bridge : false,
@@ -237,6 +244,7 @@ <h1>Ajout d'une carte avec Gp.Map.load() et l'ensemble des options possibles de
                 },
                 elevationPath : {
                     // div : "extControlDiv",
+                    export : true,
                     styles : {
                         pointer : {
                             strokeColor : "rgba(19, 141, 117, 0.7)",

diff --git a/samples-src/pages/3d/page-switch-bundle.html b/samples-src/pages/3d/page-switch-bundle.html
@@ -93,6 +93,7 @@ <h1>Test de la bascule 3D / 2D</h1>
                     },
                     route : {},
                     isocurve : {},
+                    elevationpath : {},
                     layerimport : {},
                     mousePosition : {
                         // div : "extControlDiv",

diff --git a/samples-src/resources/KML/croquis-sample.kml b/samples-src/resources/KML/croquis-sample.kml
@@ -1,5 +1,86 @@
-<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.opengis.net/kml/2.2 https://developers.google.com/kml/schema/kml22gx.xsd"><Document><Placemark><description>Une ligne
-</description><Style><LineStyle><color>ff3513e7</color><width>4</width></LineStyle></Style><LineString><coordinates>1.4062499999999998,48.94799948662481 2.5213623046875,48.51684692379888 1.8347167968749996,49.15680178017212</coordinates></LineString></Placemark><Placemark><description>Un marker 1
-</description><Style><IconStyle><Icon><href>http://api.ign.fr/api/images/api/markers/marker_01.png</href><gx:w>25</gx:w><gx:h>25</gx:h></Icon></IconStyle></Style><Point><coordinates>1.1151123046874996,48.65855637337026</coordinates></Point></Placemark><Placemark><description>Un marker 2
-</description><Style><IconStyle><Icon><href>http://api.ign.fr/api/images/api/markers/marker_02.png</href><gx:w>25</gx:w><gx:h>25</gx:h></Icon></IconStyle></Style><Point><coordinates>1.3732910156249996,48.4367329142394</coordinates></Point></Placemark><Placemark><description>Un marker 3</description><Style><IconStyle><Icon><href>http://api.ign.fr/api/images/api/markers/marker_03.png</href><gx:w>25</gx:w><gx:h>25</gx:h></Icon></IconStyle></Style><Point><coordinates>1.8951416015624998,48.38933334450539</coordinates></Point></Placemark><Placemark><description>Un polygone
-</description><Style><LineStyle><color>ffce3925</color><width>4</width></LineStyle><PolyStyle><color>3300f7ff</color></PolyStyle></Style><Polygon><outerBoundaryIs><LinearRing><coordinates>2.2412109374999996,48.319977556617204 2.9608154296875004,48.32363021503954 3.09814453125,48.70932952110317 2.647705078125,48.94439175521893 2.2412109374999996,48.319977556617204</coordinates></LinearRing></outerBoundaryIs></Polygon></Placemark><Placemark><name>Ici, un label !!!</name><Style><LabelStyle><color>ffff0000</color></LabelStyle></Style><Point><coordinates>1.4886474609375002,48.297812492437174</coordinates></Point></Placemark></Document></kml>
+<kml xmlns="http://www.opengis.net/kml/2.2" xmlns:gx="http://www.google.com/kml/ext/2.2"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://www.opengis.net/kml/2.2 https://developers.google.com/kml/schema/kml22gx.xsd">
+    <Document>
+        <Placemark>
+            <description>Une ligne
+            </description>
+            <Style>
+                <LineStyle>
+                    <color>ff3513e7</color>
+                    <width>4</width>
+                </LineStyle>
+            </Style>
+            <LineString>
+                <coordinates>1.4062499999999998,48.94799948662481 2.5213623046875,48.51684692379888
+                    1.8347167968749996,49.15680178017212</coordinates>
+            </LineString>
+        </Placemark>
+        <Placemark>
+            <description>Un marker 1
+            </description>
+            <Style>
+                <IconStyle>
+                    <Icon>
+                        <href>http://api.ign.fr/api/images/api/markers/marker_01.png</href>
+                        <gx:w>25</gx:w>
+                        <gx:h>25</gx:h>
+                    </Icon>
+                </IconStyle>
+            </Style>
+            <Point>
+                <coordinates>1.1151123046874996,48.65855637337026</coordinates>
+            </Point>
+        </Placemark>
+        <Placemark>
+            <description>Un marker 2
+            </description>
+            <Style>
+                <IconStyle>
+                    <Icon>
+                        <href>http://api.ign.fr/api/images/api/markers/marker_02.png</href>
+                        <gx:w>25</gx:w>
+                        <gx:h>25</gx:h>
+                    </Icon>
+                </IconStyle>
+            </Style>
+            <Point>
+                <coordinates>1.3732910156249996,48.4367329142394</coordinates>
+            </Point>
+        </Placemark>
+        <Placemark>
+            <description>Un marker 3</description>
+            <Style>
+                <IconStyle><Icon><href>http://api.ign.fr/api/images/api/markers/marker_03.png</href><gx:w>25</gx:w><gx:h>25</gx:h></Icon></IconStyle>
+            </Style>
+            <Point>
+                <coordinates>1.8951416015624998,48.38933334450539</coordinates>
+            </Point>
+        </Placemark>
+        <Placemark>
+            <description>Un polygone
+            </description>
+            <Style>
+                <LineStyle><color>ffce3925</color><width>4</width></LineStyle><PolyStyle><color>3300f7ff</color></PolyStyle>
+            </Style>
+            <Polygon>
+                <outerBoundaryIs>
+                    <LinearRing>
+                        <coordinates>2.2412109374999996,48.319977556617204 2.9608154296875004,48.32363021503954
+                            3.09814453125,48.70932952110317 2.647705078125,48.94439175521893
+                            2.2412109374999996,48.319977556617204</coordinates>
+                    </LinearRing>
+                </outerBoundaryIs>
+            </Polygon>
+        </Placemark>
+        <Placemark>
+            <name>Ici, un label !!!</name>
+            <Style>
+                <LabelStyle><color>ffff0000</color></LabelStyle>
+            </Style>
+            <Point>
+                <coordinates>1.4886474609375002,48.297812492437174</coordinates>
+            </Point>
+        </Placemark>
+    </Document>
+</kml>