Skip to content

Commit

Permalink
Fix geosolutions-it#271 updating config files (geosolutions-it#279)
Browse files Browse the repository at this point in the history 
* Fix geosolutions-it#271 updating config files

* Update configs/localConfig.json

Co-authored-by: Tobia Di Pisa <[email protected]>

* Update configs/new.json

Co-authored-by: Tobia Di Pisa <[email protected]>

* update urls

* Fix url config and reordering

---------

Co-authored-by: Tobia Di Pisa <[email protected]>
  • Loading branch information
@MV88 @tdipisa
MV88 and tdipisa authored Nov 12, 2024
1 parent 976c8c1 commit ca92d47
Show file tree
Hide file tree
Showing 3 changed files with 41 additions and 31 deletions.
44 changes: 27 additions & 17 deletions configs/localConfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@
"selectedService": "GeoNetwork ComuneFI intranet CSW",
"services": {
"GeoNetwork ComuneFI intranet CSW": {
"url": "http://geonetwork.comune.intranet/geonetwork/srv/ita/csw",
"url": "https://geonetwork.comune.fi.it/geonetwork/srv/ita/csw",
"type": "csw",
"title": "GeoNetwork ComuneFI intranet CSW",
"autoload": false,
Expand All @@ -140,7 +140,7 @@
}
},
"GeoServer ComuneFI intranet CSW": {
"url": "http://datigis.comune.intranet/geoserver/csw",
"url": "https://datigis.comune.fi.it/geoserver/csw",
"type": "csw",
"title": "GeoServer ComuneFI intranet CSW",
"autoload": false,
Expand All @@ -150,7 +150,7 @@
}
},
"GeoServer Urbanistica ComuneFI intranet CSW": {
"url": "http://datigis2.comune.intranet/geoserver/csw",
"url": "https://datigis2.comune.fi.it/geoserver/csw",
"type": "csw",
"title": "GeoServer Urbanistica ComuneFI intranet CSW",
"autoload": false,
Expand All @@ -160,19 +160,19 @@
}
},
"GeoServer ComuneFI intranet WMS": {
"url": "http://datigis.comune.intranet/geoserver/wms",
"url": "https://datigis.comune.fi.it/geoserver/wms",
"type": "wms",
"title": "GeoServer ComuneFI intranet WMS",
"autoload": false
},
"GeoServer Urbanistica ComuneFI intranet WMS": {
"url": "http://datigis2.comune.intranet/geoserver/wms",
"url": "https://datigis2.comune.fi.it/geoserver/wms",
"type": "wms",
"title": "GeoServer Urbanistica ComuneFI intranet WMS",
"autoload": false
},
"GeoWebCache ComuneFI intranet WMTS": {
"url": "http://datigis.comune.intranet/geoserver/gwc/service/wmts",
"url": "https://datigis.comune.fi.it/geoserver/gwc/service/wmts",
"type": "wmts",
"title": "GeoWebCache ComuneFI intranet WMTS",
"autoload": false
Expand Down Expand Up @@ -248,23 +248,33 @@
},
"AutoResourceUpdateOptions": {
"urlsToReplace": {
"http://{s}.basemaps.cartocdn.com/": "https://{s}.basemaps.cartocdn.com/",
"http://3dtiles-cloud-cofi.comune.intranet": "https://3dtiles-cloud-cofi.comune.fi.it",
"http://dati.istruzione.it/opendata": "https://dati.istruzione.it/opendata",
"http://datigis.comune.fi.it:443": "https://datigis.comune.fi.it",
"http://datigis.comune.fi.it:80": "https://datigis.comune.fi.it",
"http://datigis.comune.fi.it/geonetwork": "https://geonetwork.comune.fi.it/geonetwork",
"http://datigis.comune.fi.it/img": "https://datigis.comune.fi.it/img",
"http://datigis.comune.intranet/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://datigis2.comune.intranet/geoserver": "https://datigis2.comune.fi.it/geoserver",
"http://geonetwork.comune.intranet/geonetwork": "https://geonetwork.comune.fi.it/geonetwork",
"http://geoserver.comune.intranet/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://geostories.comune.intranet/": "https://mapstore2.comune.fi.it",
"http://img.youtube.com/vi": "https://img.youtube.com/vi",
"http://mappe.cittametropolitana.fi.it:443/geoserver": "https://mappe.cittametropolitana.fi.it/geoserver",
"http://opendata.comune.fi.it": "https://opendata.comune.fi.it",
"http://purl.org/dc":"https://www.dublincore.org",
"http://sr-vm378-sitgfn.comune.intranet:9080/geonetwork": "https://geonetwork.comune.fi.it/geonetwork",
"http://datigis.comune.fi.it/geonetwork": "https://geonetwork.comune.fi.it/geonetwork",
"http://geoserver.comune.intranet/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://datigis.comune.intranet/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://sr-vm380-sitgs1.comune.intranet:8080/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://sr-vm380-sitgs1:8080/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://datigis2.comune.intranet/geoserver": "https://datigis2.comune.fi.it/geoserver",
"http://sr-vm380-sitgs1.comune.intranet:8080/geoserver": "https://datigis.comune.fi.it/geoserver",
"http://tile.thunderforest.com": "https://tile.thunderforest.com",
"http://tms.comune.fi.it/geowebcache": "https://tms.comune.fi.it/geowebcache",
"http://tms.comune.fi.it/tiles": "https://tms.comune.fi.it/tiles",
"http://tms.comune.intranet/geoserver": "https://datigis.comune.fi.it/geoserver/gwc/service",
"http://tms.comune.intranet/geowebcache_internal": "https://datigis.comune.fi.it/geoserver/gwc/service",
"http://3dtiles-cloud-cofi.comune.intranet": "https://3dtiles-cloud-cofi.comune.fi.it"
"http://www502.regione.toscana.it/": "https://www502.regione.toscana.it/",
"https://datigis.comune.fi.it:443": "https://datigis.comune.fi.it",
"https://datigis.comune.fi.it:80": "https://datigis.comune.fi.it"
}
},
"plugins": {
Expand All @@ -286,7 +296,7 @@
"additionalLayers": [
{
"type": "wms",
"url": "http://datigis.comune.intranet/geoserver/wms",
"url": "https://datigis.comune.fi.it/geoserver/wms",
"visibility": true,
"title": "DTM_Lidar_2017",
"name": "DTM:DTM_Lidar_2017",
Expand Down Expand Up @@ -414,7 +424,7 @@
"name": "Cookie",
"cfg": {
"externalCookieUrl": "",
"declineUrl": "http://www.google.com"
"declineUrl": "https://www.google.com"
}
},
"FeedbackMask",
Expand Down Expand Up @@ -454,7 +464,7 @@
"additionalLayers": [
{
"type": "wms",
"url": "http://datigis.comune.intranet/geoserver/wms",
"url": "https://datigis.comune.fi.it/geoserver/wms",
"visibility": true,
"title": "DTM_Lidar_2017",
"name": "DTM:DTM_Lidar_2017",
Expand Down Expand Up @@ -702,7 +712,7 @@
"name": "Cookie",
"cfg": {
"externalCookieUrl": "",
"declineUrl": "http://www.google.com"
"declineUrl": "https://www.google.com"
}
},
"OmniBar",
Expand Down Expand Up @@ -944,7 +954,7 @@
"name": "Cookie",
"cfg": {
"externalCookieUrl": "",
"declineUrl": "http://www.google.com"
"declineUrl": "https://www.google.com"
}
},
{
Expand Down
26 changes: 13 additions & 13 deletions configs/new.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
"title": "Sfondo Comune Firenze 2011",
"type": "wms",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/thmb_sfondocoloriDBT2011CoFi.png",
"thumbURL": "https://datigis.comune.fi.it/img/thmb_sfondocoloriDBT2011CoFi.png",
"url": "https://tms.comune.fi.it/geowebcache/service/wms",
"visibility": true
},
Expand All @@ -38,8 +38,8 @@
"title": "Ortofoto 2019 Geoscopio",
"type": "wms",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/thmb_ortofoto2019_GeoscopioRT.png",
"url": "http://www502.regione.toscana.it/ows_ofc/com.rt.wms.RTmap/wms",
"thumbURL": "https://datigis.comune.fi.it/img/thmb_ortofoto2019_GeoscopioRT.png",
"url": "https://www502.regione.toscana.it/ows_ofc/com.rt.wms.RTmap/wms",
"visibility": false
},
{
Expand All @@ -50,7 +50,7 @@
"title": "Ortofoto Comune Firenze 2017",
"type": "wms",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/thmb_sfondiOrtofoto2017CoFi.png",
"thumbURL": "https://datigis.comune.fi.it/img/thmb_sfondiOrtofoto2017CoFi.png",
"url": "https://tms.comune.fi.it/geowebcache/service/wms",
"visibility": false
},
Expand All @@ -62,7 +62,7 @@
"title": "Ortofoto Comune Firenze 2009",
"type": "wms",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/thmb_ortofoto2009CoFi.png",
"thumbURL": "https://datigis.comune.fi.it/img/thmb_ortofoto2009CoFi.png",
"url": "https://tms.comune.fi.it/geowebcache/service/wms",
"visibility": false
},
Expand All @@ -74,8 +74,8 @@
"title": "Database Topografico Comune Firenze",
"type": "wms",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/thmb_dbt2k.png",
"url": "http://tms.comune.intranet/geowebcache_internal/service/wms",
"thumbURL": "https://datigis.comune.fi.it/img/thmb_dbt2k.png",
"url": "https://datigis.comune.fi.it/geoserver/service/wms",
"visibility": false
},
{
Expand All @@ -102,27 +102,27 @@
"name": "OpenCycleMap",
"url": "https://tile.thunderforest.com/cycle/{z}/{x}/{y}.png",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/OpenCycleMap_thmb.png",
"thumbURL": "https://datigis.comune.fi.it/img/OpenCycleMap_thmb.png",
"visibility": false
},
{
"type": "tileprovider",
"title": "Open Landscape Map",
"provider": "custom",
"name": "OpenLandscapeMap",
"url": "http://tile.thunderforest.com/landscape/{z}/{x}/{y}.png",
"url": "https://tile.thunderforest.com/landscape/{z}/{x}/{y}.png",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/OpenLandscapeMap_thmb.png",
"thumbURL": "https://datigis.comune.fi.it/img/OpenLandscapeMap_thmb.png",
"visibility": false
},
{
"type": "tileprovider",
"title": "Open Transport Map",
"provider": "custom",
"name": "OpenTransportMap",
"url": "http://tile.thunderforest.com/transport/{z}/{x}/{y}.png",
"url": "https://tile.thunderforest.com/transport/{z}/{x}/{y}.png",
"group": "background",
"thumbURL": "http://datigis.comune.fi.it/img/OpenTransportMap_thmb.png",
"thumbURL": "https://datigis.comune.fi.it/img/OpenTransportMap_thmb.png",
"visibility": false
},
{
Expand Down Expand Up @@ -160,4 +160,4 @@
}
]
}
}
}
2 changes: 1 addition & 1 deletion configs/pluginsConfig.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,7 @@
"hidden": true,
"defaultConfig": {
"externalCookieUrl": "",
"declineUrl": "http://www.google.com"
"declineUrl": "https://www.google.com"
}
},
{
Expand Down

0 comments on commit ca92d47

Please sign in to comment.