Skip to content
Snippets Groups Projects

Compare revisions

Changes are shown as if the source revision was being merged into the target revision. Learn more about comparing revisions.

Source

Select target project
No results found
Select Git revision
  • master
  • V1.0.7-changenpmrepo
  • v1.0.0
  • v1.0.1
  • v1.0.2
  • v1.0.3
  • v1.0.4
  • v1.0.5
  • v1.0.6
  • v1.0.6-1-gb-ecocompose
  • v1.0.6-gb-ecocompose
  • v1.0.7
  • v1.0.7-1-gb-ecocompose
  • v1.0.7-2-gb-ecocompose
  • v1.0.7-3-gb-ecocompose
  • v1.0.7-4-gb-ecocompose
  • v1.0.7-5-gb-ecocompose
  • v1.0.7-6-gb-ecocompose
  • v1.0.7-7-gb-ecocompose
  • v1.0.7-8-gb-ecocompose
  • v6.0.0
  • v6.0.0-RC1
  • v6.0.0-RC10
  • v6.0.0-RC11
  • v6.0.0-RC12
  • v6.0.0-RC2
  • v6.0.0-RC3
  • v6.0.0-RC4
  • v6.0.0-RC5
  • v6.1.0-RC1
30 results

Target

Select target project
  • pub/geomatique/descartes/d-inkmap
1 result
Select Git revision
  • master
  • V1.0.7-changenpmrepo
  • v1.0.0
  • v1.0.1
  • v1.0.2
  • v1.0.3
  • v1.0.4
  • v1.0.5
  • v1.0.6
  • v1.0.6-1-gb-ecocompose
  • v1.0.6-gb-ecocompose
  • v1.0.7
  • v1.0.7-1-gb-ecocompose
  • v1.0.7-2-gb-ecocompose
  • v1.0.7-3-gb-ecocompose
  • v1.0.7-4-gb-ecocompose
  • v1.0.7-5-gb-ecocompose
  • v1.0.7-6-gb-ecocompose
  • v1.0.7-7-gb-ecocompose
  • v1.0.7-8-gb-ecocompose
  • v6.0.0
  • v6.0.0-RC1
  • v6.0.0-RC10
  • v6.0.0-RC11
  • v6.0.0-RC12
  • v6.0.0-RC2
  • v6.0.0-RC3
  • v6.0.0-RC4
  • v6.0.0-RC5
  • v6.1.0-RC1
30 results
Show changes
Commits on Source (3)
...@@ -143,6 +143,21 @@ function loadContext() { ...@@ -143,6 +143,21 @@ function loadContext() {
context.items[2].items[2] = Descartes.Utils.extend(coucheGeoRefWmsSpec, {itemType:"Layer"}); context.items[2].items[2] = Descartes.Utils.extend(coucheGeoRefWmsSpec, {itemType:"Layer"});
context.items[2].items[3] = Descartes.Utils.extend(coucheOSMWmtsSpec, {itemType:"Layer"}); context.items[2].items[3] = Descartes.Utils.extend(coucheOSMWmtsSpec, {itemType:"Layer"});
context.items[2].items[4] = Descartes.Utils.extend(coucheOSMPreconfSpec, {itemType:"Layer"}); context.items[2].items[4] = Descartes.Utils.extend(coucheOSMPreconfSpec, {itemType:"Layer"});
} else if (mapContentType === "VECTORTILE") {
projection = 'EPSG:3857';
initBounds = [-800086,5055726,1150172,6772047];
maxBounds = [-800086,5055726,1150172,6772047];
minScale = 12000000;
maxScale = 100;
context.bbox = {xMin:initBounds[0], yMin:initBounds[1], xMax:initBounds[2], yMax:initBounds[3]};
context.items[0] = Descartes.Utils.extend(couchePlanIgnSansStyleVectorTileSpec, {itemType:"Layer"});
context.items[1] = Descartes.Utils.extend(couchePlanIgnVectorTileSpec, {itemType:"Layer"});
context.items[2] = Descartes.Utils.extend(couchePlanIgnGrisVectorTileSpec, {itemType:"Layer"});
context.items[3] = Descartes.Utils.extend(coucheEtalabFranceSansStyleVectorTileSpec, {itemType:"Layer"});
context.items[4] = Descartes.Utils.extend(coucheEtalabFranceVectorTileSpec, {itemType:"Layer"});
//context.items[3] = Descartes.Utils.extend(coucheGeoRefXYZSpec, {itemType:"Layer"});
} else { } else {
context.items[0] = Descartes.Utils.extend(coucheToponymesSpecWms, {itemType:"Layer"}); context.items[0] = Descartes.Utils.extend(coucheToponymesSpecWms, {itemType:"Layer"});
context.items[1] = Descartes.Utils.extend(groupeInfrasSpec, {itemType:"Group", items:[]}); context.items[1] = Descartes.Utils.extend(groupeInfrasSpec, {itemType:"Group", items:[]});
......
This diff is collapsed.
...@@ -43,6 +43,7 @@ ...@@ -43,6 +43,7 @@
<option value="moteurCarto=&mapContentType=KML">Couches Descartes (KML)</option> <option value="moteurCarto=&mapContentType=KML">Couches Descartes (KML)</option>
<option value="moteurCarto=&mapContentType=GEOJSON">Couches Descartes (GEOJSON)</option> <option value="moteurCarto=&mapContentType=GEOJSON">Couches Descartes (GEOJSON)</option>
<option value="moteurCarto=&mapContentType=CLUSTER">Couches Descartes (CLUSTER)</option> <option value="moteurCarto=&mapContentType=CLUSTER">Couches Descartes (CLUSTER)</option>
<option value="moteurCarto=&mapContentType=VECTORTILE">Couches Autres (VECTORTILE)</option>
</optgroup> </optgroup>
</select> </select>
</center> </center>
......
{ {
"name": "@descartes/d-inkmap", "name": "@descartes/d-inkmap",
"version": "6.0.0", "version": "6.1.0-RC1",
"description": "D-InkMap - Module d'impression de Descartes", "description": "D-InkMap - Module d'impression de Descartes",
"main": "dist/d-inkmap.js", "main": "dist/d-inkmap.js",
"scripts": { "scripts": {
...@@ -55,8 +55,8 @@ ...@@ -55,8 +55,8 @@
}, },
"dependencies": { "dependencies": {
"@camptocamp/inkmap": "1.3.0", "@camptocamp/inkmap": "1.3.0",
"@descartes/d-map": "6.0.0", "@descartes/d-map": "6.1.0-RC1",
"@descartes/d-editmap": "6.0.0", "@descartes/d-editmap": "6.1.0-RC1",
"@webcomponents/custom-elements": "^1.4.3", "@webcomponents/custom-elements": "^1.4.3",
"file-saver": "2.0.5", "file-saver": "2.0.5",
"geostyler-openlayers-parser": "2.4.0", "geostyler-openlayers-parser": "2.4.0",
......
...@@ -66,6 +66,7 @@ var print = { ...@@ -66,6 +66,7 @@ var print = {
[8, 'GENERICVECTOR'], //GenericVector [8, 'GENERICVECTOR'], //GenericVector
[9, 'XYZ'], //OSM [9, 'XYZ'], //OSM
[100, 'XYZ'], //XYZ [100, 'XYZ'], //XYZ
[101, 'XYZ'], //VectorTile
[10, 'VECTOR'], //EDITION_WFS [10, 'VECTOR'], //EDITION_WFS
[11, 'VECTOR'], //EDITION_KML [11, 'VECTOR'], //EDITION_KML
[12, 'VECTOR'], //EDITION_GeoJSON [12, 'VECTOR'], //EDITION_GeoJSON
......