diff --git a/MapStore2 b/MapStore2 index 54603d2..a3d9dfa 160000 --- a/MapStore2 +++ b/MapStore2 @@ -1 +1 @@ -Subproject commit 54603d251d5dbfc194eb4ddb5c8a33216a40cccf +Subproject commit a3d9dfa8f9a9cbc5315b6a62dfa7197ebcb14e8a diff --git a/configs/localConfig.json b/configs/localConfig.json index 2865f5a..cf81796 100644 --- a/configs/localConfig.json +++ b/configs/localConfig.json @@ -8,7 +8,19 @@ "https://nominatim.openstreetmap.org", "http://cloudsdi.geo-solutions.it", "https://gs-stable.geo-solutions.it/geoserver", - "https://gs-stable.geo-solutions.it:443/geoserver" + "https://gs-stable.geo-solutions.it:443/geoserver", + "http://gs-stable.geo-solutions.it/geoserver", + "http://gs-stable.geo-solutions.it:443/geoserver", + "https://gs-stable.geosolutionsgroup.com/geoserver", + "https://gs-stable.geosolutionsgroup.com:443/geoserver", + "http://gs-stable.geosolutionsgroup.com/geoserver", + "http://gs-stable.geosolutionsgroup.com:443/geoserver", + "https://tile.googleapis.com", + "https://maps1.geosolutionsgroup.com/geoserver/", + "https://maps2.geosolutionsgroup.com/geoserver/", + "https://maps3.geosolutionsgroup.com/geoserver/", + "https://maps4.geosolutionsgroup.com/geoserver/", + "https://maps5.geosolutionsgroup.com/geoserver/" ] }, "geoStoreUrl": "rest/geostore/", @@ -126,7 +138,15 @@ "opacity": 1, "title": "Sentinel 2 Cloudless", "type": "wms", - "url": "https://1maps.geo-solutions.it/geoserver/wms", + "url": [ + "https://maps1.geosolutionsgroup.com/geoserver/wms", + "https://maps2.geosolutionsgroup.com/geoserver/wms", + "https://maps3.geosolutionsgroup.com/geoserver/wms", + "https://maps4.geosolutionsgroup.com/geoserver/wms", + "https://maps5.geosolutionsgroup.com/geoserver/wms", + "https://maps6.geosolutionsgroup.com/geoserver/wms" + ], + "tileSize": 512, "source": "s2cloudless", "singleTile": false, "visibility": false @@ -217,11 +237,9 @@ { "name": "TOC", "cfg": { - "activateMetedataTool": false, "activateMapTitle": false, "activateSortLayer": false, - "activateLayerFilterTool": false, - "activateQueryTool": false + "activateLayerFilterTool": false } }, "AddGroup", @@ -413,10 +431,8 @@ { "name": "TOC", "cfg": { - "activateQueryTool": true, "activateAddLayerButton": true, "activateAddGroupButton": true, - "activateMetedataTool": false, "addLayersPermissions": true, "removeLayersPermissions": true, "sortingPermissions": true, @@ -651,8 +667,6 @@ "name": "TOC", "cfg": { "activateMapTitle": false, - "activateSettingsTool": false, - "activateMetedataTool": false, "activateRemoveLayer": false } }, @@ -793,9 +807,6 @@ "className": "navbar shadow navbar-home" } }, - { - "name": "Login" - }, { "name": "Language" }, @@ -811,9 +822,6 @@ { "name": "Attribution" }, - { - "name": "Home" - }, { "name": "DeleteDashboard" }, @@ -880,9 +888,6 @@ "containerPosition": "columns" } }, - { - "name": "BurgerMenu" - }, { "name": "Dashboard" }, @@ -916,6 +921,31 @@ "cfg": { "containerPosition": "header" } + }, + "Details", + "AddWidgetDashboard", + "MapConnectionDashboard", + { + "name": "SidebarMenu", + "cfg": { + "containerPosition": "columns" + } + }, + { + "name": "Home", + "override": { + "OmniBar": { + "priority": 5 + } + } + }, + { + "name": "Login", + "override": { + "OmniBar": { + "priority": 5 + } + } } ], "geostory-embedded": [ diff --git a/configs/new.json b/configs/new.json index 2899b2d..c68d3db 100644 --- a/configs/new.json +++ b/configs/new.json @@ -49,13 +49,14 @@ "title": "Sentinel 2 Cloudless", "type": "wms", "url": [ - "https://1maps.geo-solutions.it/geoserver/wms", - "https://2maps.geo-solutions.it/geoserver/wms", - "https://3maps.geo-solutions.it/geoserver/wms", - "https://4maps.geo-solutions.it/geoserver/wms", - "https://5maps.geo-solutions.it/geoserver/wms", - "https://6maps.geo-solutions.it/geoserver/wms" + "https://maps1.geosolutionsgroup.com/geoserver/wms", + "https://maps2.geosolutionsgroup.com/geoserver/wms", + "https://maps3.geosolutionsgroup.com/geoserver/wms", + "https://maps4.geosolutionsgroup.com/geoserver/wms", + "https://maps5.geosolutionsgroup.com/geoserver/wms", + "https://maps6.geosolutionsgroup.com/geoserver/wms" ], + "tileSize": 512, "source": "s2cloudless", "visibility": false, "singleTile": false diff --git a/configs/pluginsConfig.json b/configs/pluginsConfig.json index 0a6e6d4..fbbf77c 100644 --- a/configs/pluginsConfig.json +++ b/configs/pluginsConfig.json @@ -59,7 +59,8 @@ "FeatureEditor", "FilterLayer", "AddGroup", - "Swipe" + "Swipe", + "MetadataInfo" ], "autoEnableChildren": [ "TOCItemsSettings", @@ -401,6 +402,9 @@ { "name": "Swipe" }, + { + "name": "MetadataInfo" + }, { "name": "SearchByBookmark" }, @@ -495,9 +499,14 @@ "denyUserSelection": true, "title": "plugins.Save.title", "description": "plugins.Save.description", - "dependencies": [ - "SidebarMenu", + "children": [ + "SaveAs" + ], + "autoEnableChildren": [ "SaveAs" + ], + "dependencies": [ + "SidebarMenu" ] }, { diff --git a/package.json b/package.json index 40b2c22..2b05057 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "MapStore-C179", - "version": "1.0.0", + "version": "1.1.0", "description": "PUBLIACQUA", "repository": "git@github.com:geosolutions-it/MapStore-C179.git", "main": "index.js", diff --git a/resources/geoserver/print/config.yaml b/resources/geoserver/print/config.yaml index 1c6c91d..1739d6c 100644 --- a/resources/geoserver/print/config.yaml +++ b/resources/geoserver/print/config.yaml @@ -10,23 +10,16 @@ dpis: # the allowed scales #=========================================================================== scales: + - 100 + - 200 - 500 - 1000 - 2000 - 5000 - 10000 - - 20000 - 50000 - 100000 - - 200000 - - 500000 - - 100000 - - 500000 - - 1000000 - - 2000000 - - 4000000 - - 10000000 - - 20000000 + - 250000 formats: - '*' @@ -39,7 +32,7 @@ hosts: dummy: true - !ipMatch - host: 127.0.0.1 + ip: 127.0.0.1 # Allow to all hosts mask: 0.0.0.0 @@ -142,7 +135,6 @@ layouts: nbColumns: 1 items: - !text - width: 123 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -246,7 +238,6 @@ layouts: nbColumns: 1 items: - !text - width: 205 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -324,7 +315,6 @@ layouts: nbColumns: 1 items: - !text - width: 178 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -402,7 +392,6 @@ layouts: nbColumns: 1 items: - !text - width: 260 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -480,7 +469,6 @@ layouts: nbColumns: 1 items: - !text - width: 178 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -493,7 +481,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 595 842 landscape: false items: @@ -596,7 +583,6 @@ layouts: nbColumns: 1 items: - !text - width: 260 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -609,7 +595,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 842 595 landscape: false items: @@ -738,7 +723,6 @@ layouts: nbColumns: 1 items: - !text - width: 191 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -842,7 +826,6 @@ layouts: nbColumns: 1 items: - !text - width: 307 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -920,7 +903,6 @@ layouts: nbColumns: 1 items: - !text - width: 260 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -998,7 +980,6 @@ layouts: nbColumns: 1 items: - !text - width: 376 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1076,7 +1057,6 @@ layouts: nbColumns: 1 items: - !text - width: 260 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1089,7 +1069,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 842 1190 landscape: false items: @@ -1192,7 +1171,6 @@ layouts: nbColumns: 1 items: - !text - width: 376 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1205,7 +1183,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 1190 842 landscape: false items: @@ -1334,7 +1311,6 @@ layouts: nbColumns: 1 items: - !text - width: 290 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1438,7 +1414,6 @@ layouts: nbColumns: 1 items: - !text - width: 455 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1516,7 +1491,6 @@ layouts: nbColumns: 1 items: - !text - width: 376 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1594,7 +1568,6 @@ layouts: nbColumns: 1 items: - !text - width: 541 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1672,7 +1645,6 @@ layouts: nbColumns: 1 items: - !text - width: 376 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1685,7 +1657,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 1190 1684 landscape: false items: @@ -1788,7 +1759,6 @@ layouts: nbColumns: 1 items: - !text - width: 541 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -1801,7 +1771,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 1684 1190 landscape: false items: @@ -1930,7 +1899,6 @@ layouts: nbColumns: 1 items: - !text - width: 438 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -2034,7 +2002,6 @@ layouts: nbColumns: 1 items: - !text - width: 670 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -2112,7 +2079,6 @@ layouts: nbColumns: 1 items: - !text - width: 541 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -2190,7 +2156,6 @@ layouts: nbColumns: 1 items: - !text - width: 773 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -2268,7 +2233,6 @@ layouts: nbColumns: 1 items: - !text - width: 541 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -2281,7 +2245,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 1684 2380 landscape: false items: @@ -2384,7 +2347,6 @@ layouts: nbColumns: 1 items: - !text - width: 773 text: '${now dd.MM.yyyy}' fontEncoding: Cp1252 fontSize: 9 @@ -2397,7 +2359,6 @@ layouts: type: 'bar sub' intervals: 5 lastPage: - rotation: true pageSize: 2380 1684 landscape: false items: diff --git a/updateDevDependencies.js b/updateDevDependencies.js new file mode 100644 index 0000000..7c9fc23 --- /dev/null +++ b/updateDevDependencies.js @@ -0,0 +1,20 @@ +const denodeify = require('denodeify'); +const fs = require('fs'); +const writeFile = denodeify(fs.writeFile); + +const updateProjectDevDependencies = () => { + process.stdout.write('Updating devDepndencies in package.json...\n'); + const projPackageJSON = require('./package.json'); + const ms2PackageJSON = require('./MapStore2/package.json'); + const packageJSON = { ...projPackageJSON , devDependencies: ms2PackageJSON.devDependencies}; + return writeFile('./package.json', JSON.stringify(packageJSON, null, 4)); + +} +updateProjectDevDependencies().then(() => { + process.stdout.write('devDependencies update OK!\n'); + process.exit(); +}) +.catch((err) => { + process.stdout.write('Error updatind devDependencies\n'); + process.stderr.write(err + '\n'); +}); \ No newline at end of file diff --git a/version.txt b/version.txt index 0e33221..f0ad183 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -MapStore-C179-1.0.0 \ No newline at end of file +MapStore-C179-1.1.0-rc \ No newline at end of file diff --git a/web/pom.xml b/web/pom.xml index 062e9e8..6dcefa7 100644 --- a/web/pom.xml +++ b/web/pom.xml @@ -15,6 +15,17 @@ UTF-8 8.5.69 8080 + 1.7.2 + 2.1.0 + 1.5.0 + 2.4-SNAPSHOT + 4.5.13 + 4.13.1 + 1.9.5 + 3.0.1 + 2.0.4 + 1.5.4 + 2.3.1 @@ -22,58 +33,58 @@ it.geosolutions.mapstore mapstore-services - 1.7-SNAPSHOT + ${mapstore-services.version} - it.geosolutions.geostore - geostore-webapp - 2.1-SNAPSHOT - war - runtime + it.geosolutions.geostore + geostore-webapp + ${geostore-webapp.version} + war + runtime - proxy - http_proxy - 1.5-SNAPSHOT - war - runtime + proxy + http_proxy + ${http_proxy.version} + war + runtime - junit - junit - test - 4.13.1 - - - - org.mockito - mockito-all - 1.9.5 - test - - - - javax.servlet - javax.servlet-api - 3.0.1 - - - - net.sf.ehcache - ehcache-web - 2.0.4 - - - - commons-pool - commons-pool - 1.5.4 - - + junit + junit + test + ${junit.version} + + + + org.mockito + mockito-all + ${mockito-all.version} + test + + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + + net.sf.ehcache + ehcache-web + ${ehcache-web.version} + + + + commons-pool + commons-pool + ${commons-pool.version} + + MapStore-C179 @@ -484,7 +495,43 @@ org.apache.httpcomponents httpclient - 4.5.13 + ${httpclient.version} + + + + junit + junit + test + ${junit.version} + + + + org.mockito + mockito-all + ${mockito-all.version} + + + + javax.servlet + javax.servlet-api + ${javax.servlet-api.version} + + + + net.sf.ehcache + ehcache-web + ${ehcache-web.version} + + + + commons-pool + commons-pool + ${commons-pool.version} + + + javax.xml.ws + jaxws-api + ${jaxws-api.version} @@ -493,7 +540,7 @@ org.mapfish.print print-lib - geosolutions-2.2.0 + ${print-lib.version} commons-codec diff --git a/web/src/main/resources/log4j2.properties b/web/src/main/resources/log4j2.properties index b7afbfb..9c480cb 100644 --- a/web/src/main/resources/log4j2.properties +++ b/web/src/main/resources/log4j2.properties @@ -10,7 +10,7 @@ rootLogger.appenderRef.stdout.ref = LogToConsole rootLogger.appenderRef.console.ref = LogToConsole appender.file.type = File -appender.file.name = LogToFiletomcat.version>8.5.69