Skip to content

Commit

Permalink
maj package tgz + mise à niveau du code avec le nouveau depot + activ…
Browse files Browse the repository at this point in the history
…ation par defaut des nouveaux widgets
  • Loading branch information
lowzonenose committed Sep 23, 2024
1 parent 6282371 commit 00cd592
Show file tree
Hide file tree
Showing 16 changed files with 102 additions and 18 deletions.
7 changes: 6 additions & 1 deletion build/widgets.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,11 @@
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/ReverseGeocode/ReverseGeocode.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Measures/MeasureArea.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Measures/MeasureLength.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Measures/MeasureAzimuth.js"
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Measures/MeasureAzimuth.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Catalog/Catalog.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Legends/Legends.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/OverviewMap/GeoportalOverviewMap.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/FullScreen/GeoportalFullScreen.js",
"node_modules/geoportal-extensions-openlayers/src/packages/Controls/Zoom/GeoportalZoom.js"
]
}
Binary file added geopf-extensions-openlayers-1.0.0-beta.0-165.tgz
Binary file not shown.
Binary file removed geoportal-extensions-openlayers-1.0.0-beta.12.tgz
Binary file not shown.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"@gouvfr/dsfr": "^1.11.0",
"file-saver": "^2.0.5",
"geoportal-access-lib": "3.4.0",
"geoportal-extensions-openlayers": "./geoportal-extensions-openlayers-1.0.0-beta.12.tgz",
"geoportal-extensions-openlayers": "./geopf-extensions-openlayers-1.0.0-beta.0-165.tgz",
"ol": "8.2.0"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion src/components/TheThematic.vue
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ export default {
beforeMount() {
// INFO
// l'opération d'ajout des tags link pour les thémes est realisée par webpack (cf. vue.config.js) :
// <link href="./node_modules/geoportal-extensions-openlayers/css/Portail.css" rel="stylesheet" id="portail">
// <link href="./node_modules/geoportal-extensions-openlayers/css/Classic.css" rel="stylesheet" id="portail">
// <link href="./node_modules/geoportal-extensions-openlayers/css/Dsfr.css" rel="alternate stylesheet" id="dsfr">
// idem pour les css di DSFR !
},
Expand Down
12 changes: 6 additions & 6 deletions src/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,19 +9,19 @@ var apiKey = "full";
*/
var project = {
sourceProject : "https://github.com/IGNF/geoportal-extensions-openlayers-samples",
sourceExtensions: "https://ignf.github.io/geoportal-extensions-openlayers",
jsdoc: "https://ignf.github.io/geoportal-extensions-openlayers/current/jsdoc/",
sourceExtensions: "https://ignf.github.io/geopf-extensions-openlayers",
jsdoc: "https://ignf.github.io/geopf-extensions-openlayers/jsdoc/",
library: {
name: "OpenLayers",
url: "https://openlayers.org/",
logo: "./assets/logo-openlayers.png",
dist: {
js: "https://raw.githubusercontent.com/IGNF/geoportal-extensions-openlayers/master/samples-src/resources/vendor/ol/v6.9.0/ol.js",
css: "https://raw.githubusercontent.com/IGNF/geoportal-extensions-openlayers/master/samples-src/resources/vendor/ol/v6.9.0/ol.css"
js: "https://raw.githubusercontent.com/IGNF/geopf-extensions-openlayers/refs/heads/main/samples-src/resources/vendor/ol/v8.2.0/ol.js",
css: "https://raw.githubusercontent.com/IGNF/geopf-extensions-openlayers/refs/heads/main/samples-src/resources/vendor/ol/v8.2.0/ol.css"
},
plugin: {
js: "https://ignf.github.io/geoportal-extensions-openlayers/latest/dist/Widgets.js",
css: "https://ignf.github.io/geoportal-extensions-openlayers/latest/dist/Widgets.css"
js: "https://raw.githubusercontent.com/IGNF/geopf-extensions-openlayers/refs/heads/gh-pages/dist/bundle/GpfExtOL.js",
css: "https://raw.githubusercontent.com/IGNF/geopf-extensions-openlayers/refs/heads/gh-pages/dist/bundle/Dsfr.css"
}
}
};
Expand Down
1 change: 1 addition & 0 deletions src/data/openlayers-catalog.doclet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"catalog","auto":true,"params":[{"type":{"names":["Object"]},"description":"options for function call.","name":"options","value":null,"section":true}],"examples":["var widget = new ol.control.Catalog({\n collapsed : true,\n draggable : false,\n titlePrimary : \"\",\n titleSecondary : \"Gérer vos couches de données\",\n layerLabel : \"title\",\n layerFilter : [],\n search : {\n display : true, \n criteria : [\n \"name\",\n \"title\",\n \"description\"\n ]\n },\n addToMap : true,\n categories : [\n {\n title : \"Données\",\n id : \"data\",\n default : true,\n filter : null\n // sous categories\n // items : [\n // {\n // title : \"\",\n // default : true,\n // filter : {\n // field : \"\",\n // value : \"\"\n // }\n // }\n // ]\n }\n ],\n configuration : {\n type : \"json\", // type:\"service\"\n urls : [ // data:{}\n \"https://raw.githubusercontent.com/IGNF/cartes.gouv.fr-entree-carto/main/public/data/layers.json\",\n \"https://raw.githubusercontent.com/IGNF/cartes.gouv.fr-entree-carto/main/public/data/edito.json\"\n ]\n }\n});\nwidget.on(\"catalog:loaded\", (e) => { console.log(e.data); });\nwidget.on(\"catalog:layer:add\", (e) => { console.log(e); });\nwidget.on(\"catalog:layer:remove\", (e) => { console.log(e); });\nmap.addControl(widget);"]}
1 change: 1 addition & 0 deletions src/data/openlayers-geoportalfullscreen.doclet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"geoportalfullscreen","auto":true,"params":[{"type":{"names":["Object"]},"description":"ol.control.FullScreen options (see {@link http://openlayers.org/en/latest/apidoc/ol.control.FullScreen.html ol.Control.FullScreen})","name":"options","value":null,"section":true}],"examples":["var zoom = new ol.control.GeoportalFullScreen({\n position: \"top-left\"\n});\nmap.addControl(zoom);"]}
1 change: 1 addition & 0 deletions src/data/openlayers-geoportaloverviewmap.doclet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"geoportaloverviewmap","auto":true,"params":[{"type":{"names":["Object"]},"description":"ol.control.OverviewMap options (see {@link http://openlayers.org/en/latest/apidoc/ol.control.OverviewMap.html ol.Control.OverviewMap})","name":"options","value":null,"section":true}],"examples":["var overviewmap = new ol.control.GeoportalOverviewMap({\n position: \"top-left\"\n});\nmap.addControl(overviewmap);"]}
1 change: 1 addition & 0 deletions src/data/openlayers-geoportalzoom.doclet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"geoportalzoom","auto":true,"params":[{"type":{"names":["Object"]},"description":"ol.control.Zoom options (see {@link http://openlayers.org/en/latest/apidoc/ol.control.Zoom.html ol.Control.Zoom})","name":"options","value":null,"section":true}],"examples":["var zoom = new ol.control.GeoportalZoom({\n position: \"top-left\"\n});\nmap.addControl(zoom);"]}
2 changes: 1 addition & 1 deletion src/data/openlayers-layerswitcher.doclet.json
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"name":"layerswitcher","auto":true,"params":[{"type":{"names":["Object"]},"description":"control options","name":"options","value":null,"section":true},{"type":{"names":["Array"]},"optional":true,"description":"list of layers to be configured. Each array element is an object, with following properties :","name":"options.layers","value":null,"section":true},{"type":{"names":["ol.layer.Layer"]},"optional":true,"description":"ol.layer.Layer layer to be configured (that has been added to map)","name":"options.layers.layer","value":null,"section":false},{"type":{"names":["Object"]},"optional":true,"description":"custom configuration object for layer information (title, description, legends, metadata, quicklook url), with following properties :","name":"options.layers.config","value":null,"section":true},{"type":{"names":["String"]},"optional":true,"description":"layer alias, to be displayed in widget layer list. E.g. : \"Cartes IGN\"","name":"options.layers.config.title","value":null,"section":false},{"type":{"names":["String"]},"optional":true,"description":"layer description, to be displayed on title hover, or in layer information panel.","name":"options.layers.config.description","value":null,"section":false},{"type":{"names":["String"]},"optional":true,"description":"link to a quick look image for this layer.","name":"options.layers.config.quicklookUrl","value":null,"section":false},{"type":{"names":["Array"]},"optional":true,"description":"array of layer legends. Each array element is an object, with following properties :\n - url (String, mandatory) : link to a legend\n - minScaleDenominator (Number, optional) : min scale denominator for legend validity.","name":"options.layers.config.legends","value":null,"section":false},{"type":{"names":["Array"]},"optional":true,"description":"array of layer metadata. Each array element is an object, with property url (String, mandatory) : link to a metadata","name":"options.layers.config.metadata","value":null,"section":false},{"type":{"names":["Object"]},"optional":true,"description":"ol.control.Control options (see {@link http://openlayers.org/en/latest/apidoc/ol.control.Control.html ol.control.Control})","name":"options.options","value":null,"section":true},{"type":{"names":["Boolean"]},"optional":true,"defaultvalue":true,"description":"Specify if widget has to be collapsed (true) or not (false) on map loading. Default is true.","name":"options.options.collapsed","value":null,"section":false}],"examples":["map.addControl(new ol.control.LayerSwitcher(\n [\n {\n layer : wms1,\n config : {\n title : \"test layer name 1\",\n description : \"test layer desc 1\",\n }\n }\n ],\n {\n collapsed : true\n }\n));"]}
{"name":"layerswitcher","auto":true,"params":[{"type":{"names":["Object"]},"description":"control options","name":"options","value":null,"section":true},{"type":{"names":["Array"]},"optional":true,"description":"list of layers to be configured. Each array element is an object, with following properties :","name":"options.layers","value":null,"section":true},{"type":{"names":["ol.layer.Layer"]},"optional":true,"description":"ol.layer.Layer layer to be configured (that has been added to map)","name":"options.layers.layer","value":null,"section":false},{"type":{"names":["Object"]},"optional":true,"description":"custom configuration object for layer information (title, description, legends, metadata, quicklook url), with following properties :","name":"options.layers.config","value":null,"section":true},{"type":{"names":["String"]},"optional":true,"description":"layer alias, to be displayed in widget layer list. E.g. : \"Cartes IGN\"","name":"options.layers.config.title","value":null,"section":false},{"type":{"names":["String"]},"optional":true,"description":"layer description, to be displayed on title hover, or in layer information panel.","name":"options.layers.config.description","value":null,"section":false},{"type":{"names":["String"]},"optional":true,"description":"link to a quick look image for this layer.","name":"options.layers.config.quicklookUrl","value":null,"section":false},{"type":{"names":["Array"]},"optional":true,"description":"array of layer legends. Each array element is an object, with following properties :\n - url (String, mandatory) : link to a legend\n - minScaleDenominator (Number, optional) : min scale denominator for legend validity.","name":"options.layers.config.legends","value":null,"section":false},{"type":{"names":["Array"]},"optional":true,"description":"array of layer metadata. Each array element is an object, with property url (String, mandatory) : link to a metadata","name":"options.layers.config.metadata","value":null,"section":false},{"type":{"names":["Object"]},"optional":true,"description":"ol.control.Control options (see {@link http://openlayers.org/en/latest/apidoc/ol.control.Control.html ol.control.Control})","name":"options.options","value":null,"section":true},{"type":{"names":["Boolean"]},"optional":true,"defaultvalue":true,"description":"Specify if widget has to be collapsed (true) or not (false) on map loading. Default is true.","name":"options.options.collapsed","value":null,"section":false},{"type":{"names":["Boolean"]},"optional":true,"defaultvalue":false,"description":"Specify if widget has to have a panel header. Default is false.","name":"options.options.panel","value":null,"section":false},{"type":{"names":["Boolean"]},"optional":true,"defaultvalue":false,"description":"Specify if widget has to have a counter. Default is false.","name":"options.options.counter","value":null,"section":false}],"examples":["map.addControl(new ol.control.LayerSwitcher(\n [\n {\n layer : wms1,\n config : {\n title : \"test layer name 1\",\n description : \"test layer desc 1\",\n }\n }\n ],\n {\n collapsed : true,\n panel : false,\n counter : false,\n position : \"top-left\"\n }\n));\n\nLayerSwitcher.on(\"layerswitcher:add\", function (e) {\n console.warn(\"layer\", e.layer);\n});\nLayerSwitcher.on(\"layerswitcher:remove\", function (e) {\n console.warn(\"layer\", e.layer);\n});\nLayerSwitcher.on(\"layerswitcher:change:opacity\", function (e) {\n console.warn(\"layer\", e.layer, e.opacity);\n});\nLayerSwitcher.on(\"layerswitcher:change:visibility\", function (e) {\n console.warn(\"layer\", e.layer, e.visibility);\n});"]}
1 change: 1 addition & 0 deletions src/data/openlayers-legends.doclet.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
{"name":"legends","auto":true,"params":[{"type":{"names":["Object"]},"description":"options for function call.","name":"options","value":null,"section":true}],"examples":["var legends = new ol.control.Legends();\nmap.addControl(legends);"]}
Loading

0 comments on commit 00cd592

Please sign in to comment.