diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 4ce43b69b5c..6402b4d4537 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -55,7 +55,7 @@ further defined and clarified by project maintainers. ## Enforcement Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported by contacting the project team via alessio.fabiani@geo-solutions.it . All +reported by contacting the project team via alessio.fabiani@geosolutionsgroup.com . All complaints will be reviewed and investigated and will result in a response that is deemed necessary and appropriate to the circumstances. The project team is obligated to maintain confidentiality with regard to the reporter of an incident. diff --git a/celery-cmd b/celery-cmd index 0ec2b76b296..a1c7fbd98fc 100644 --- a/celery-cmd +++ b/celery-cmd @@ -1,6 +1,6 @@ #!/usr/bin/env bash # A configurable celery command. -# Luca Pasquali +# Luca Pasquali CELERY_BIN=${CELERY_BIN:-"$(which celery||echo celery)"} CELERY_APP=${CELERY_APP:-"geonode.celery_app:app"} CELERY__STATE_DB=${CELERY__STATE_DB:-"/mnt/volumes/statics/worker.state"} diff --git a/geonode/local_settings.py.geoserver.sample b/geonode/local_settings.py.geoserver.sample index 1b1fcfb5d4d..b1bafebe4ae 100644 --- a/geonode/local_settings.py.geoserver.sample +++ b/geonode/local_settings.py.geoserver.sample @@ -315,14 +315,6 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'mapstore': GEONODE_CATALOGUE_SERVICE = get_geonode_catalogue_service() - MAPSTORE_CATALOGUE_SERVICES = {} - - MAPSTORE_CATALOGUE_SELECTED_SERVICE = "" - - if GEONODE_CATALOGUE_SERVICE: - MAPSTORE_CATALOGUE_SERVICES[list(GEONODE_CATALOGUE_SERVICE.keys())[0]] = GEONODE_CATALOGUE_SERVICE[list(GEONODE_CATALOGUE_SERVICE.keys())[0]] - MAPSTORE_CATALOGUE_SELECTED_SERVICE = list(GEONODE_CATALOGUE_SERVICE.keys())[0] - DEFAULT_MS2_BACKGROUNDS = [ { "type": "tileprovider", @@ -377,10 +369,20 @@ if GEONODE_CLIENT_LAYER_PREVIEW_LIBRARY == 'mapstore': "format": "image/jpeg", "id": "s2cloudless", "name": "s2cloudless:s2cloudless", - "url": "https://maps.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" + ], "group": "background", - "thumbURL": "%sstatic/mapstorestyle/img/s2cloudless-s2cloudless.png" % SITEURL, - "visibility": False + "thumbURL": f"{SITEURL}static/mapstorestyle/img/s2cloudless-s2cloudless.png", + "visibility": False, + "credits": { + "title": "Sentinel-2 cloudless 2016 by EOX IT Services GmbH" + } }, { "source": "ol", diff --git a/geonode/locale/it/LC_MESSAGES/django.po b/geonode/locale/it/LC_MESSAGES/django.po index b50cfd83b7d..154a9219bfc 100644 --- a/geonode/locale/it/LC_MESSAGES/django.po +++ b/geonode/locale/it/LC_MESSAGES/django.po @@ -33,7 +33,7 @@ # Antonio , 2013 # Paolo Corti , 2013 # Stefano Menegon , 2015 -# Alessio Fabiani , 2021 +# Alessio Fabiani , 2021 msgid "" msgstr "" "Project-Id-Version: GeoNode\n" diff --git a/geonode/maps/api/tests.py b/geonode/maps/api/tests.py index 7f94d56bfb6..98e75d0bb7b 100644 --- a/geonode/maps/api/tests.py +++ b/geonode/maps/api/tests.py @@ -293,7 +293,7 @@ def test_create_map(self): }, { "id": "s2cloudless", - "url": "https://maps.geo-solutions.it/geoserver/wms", + "url": "https://maps.geosolutionsgroup.com.it/geoserver/wms", "name": "s2cloudless:s2cloudless", "type": "wms", "group": "background", diff --git a/geonode/monitoring/tests/resources/req.xml b/geonode/monitoring/tests/resources/req.xml index 910e50ddb23..9fd75d11bb5 100644 --- a/geonode/monitoring/tests/resources/req.xml +++ b/geonode/monitoring/tests/resources/req.xml @@ -21,7 +21,7 @@ Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) 0.0 0.0 -demo.geo-solutions.it +demo.geosolutionsgroup.com ks390295.kimsufi.com WMS GetMap @@ -33,7 +33,7 @@ Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) image/png 200 -http://dev.mapstore2.geo-solutions.it/mapstore/examples/api/?map=Prueba +http://dev.mapstore2.geosolutionsgroup.com/mapstore/examples/api/?map=Prueba -45.00000000000001 diff --git a/geonode/monitoring/tests/resources/req_err.xml b/geonode/monitoring/tests/resources/req_err.xml index e104799c922..1b8440976ed 100644 --- a/geonode/monitoring/tests/resources/req_err.xml +++ b/geonode/monitoring/tests/resources/req_err.xml @@ -17,7 +17,7 @@ Mozilla/5.0 (Windows NT 6.3; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36 0.0 0.0 - demo.geo-solutions.it + demo.geosolutionsgroup.com ks390295.kimsufi.com WMS GetMap @@ -443,7 +443,7 @@ 200 - http://mapstore2.geo-solutions.it/mapstore/ + http://mapstore2.geosolutionsgroup.com/mapstore/ -56.25000000000001 -45.00000000000001 diff --git a/geonode/services/test_selenium.py b/geonode/services/test_selenium.py index 6743fd33608..8c7ced5b898 100644 --- a/geonode/services/test_selenium.py +++ b/geonode/services/test_selenium.py @@ -54,7 +54,7 @@ def setUpClass(cls): reg_url = reverse('register_service') cls.client.get(reg_url) - url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' + url = 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' service_type = enumerations.WMS form_data = { 'url': url, diff --git a/geonode/services/tests.py b/geonode/services/tests.py index fad4c0f7360..5de736f7a01 100644 --- a/geonode/services/tests.py +++ b/geonode/services/tests.py @@ -812,7 +812,7 @@ def test_local_user_cant_delete_service(self): self.client.logout() response = self.client.get(reverse('register_service')) self.assertEqual(response.status_code, 302) - url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' + url = 'https://maps.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' # url = "http://fake" service_type = enumerations.WMS form_data = { @@ -858,14 +858,14 @@ def test_local_user_cant_delete_service(self): @flaky(max_runs=3) def test_add_duplicate_remote_service_url(self): form_data = { - 'url': 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities', + 'url': 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities', 'type': enumerations.WMS } self.client.login(username='serviceowner', password='somepassword') # Add the first resource - url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' + url = 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' # url = "http://fake" service_type = enumerations.WMS form_data = { @@ -911,7 +911,7 @@ def setUpClass(cls): reg_url = reverse('register_service') cls.client.get(reg_url) - url = 'https://demo.geo-solutions.it/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' + url = 'https://demo.geosolutionsgroup.com/geoserver/ows?service=wms&version=1.3.0&request=GetCapabilities' service_type = enumerations.WMS form_data = { 'url': url, diff --git a/geonode/settings.py b/geonode/settings.py index 9e3aa69fbd4..4caac02f33d 100644 --- a/geonode/settings.py +++ b/geonode/settings.py @@ -1463,14 +1463,6 @@ def get_geonode_catalogue_service(): GEONODE_CATALOGUE_SERVICE = get_geonode_catalogue_service() - MAPSTORE_CATALOGUE_SERVICES = {} - - MAPSTORE_CATALOGUE_SELECTED_SERVICE = "" - - if GEONODE_CATALOGUE_SERVICE: - MAPSTORE_CATALOGUE_SERVICES[list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]] = GEONODE_CATALOGUE_SERVICE[list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0]] # noqa - MAPSTORE_CATALOGUE_SELECTED_SERVICE = list(list(GEONODE_CATALOGUE_SERVICE.keys()))[0] - DEFAULT_MS2_BACKGROUNDS = [ { "type": "osm", @@ -1493,7 +1485,7 @@ def get_geonode_catalogue_service(): "format": "image/jpeg", "id": "s2cloudless", "name": "s2cloudless:s2cloudless", - "url": "https://maps.geo-solutions.it/geoserver/wms", + "url": "https://maps.geosolutionsgroup.com/geoserver/wms", "group": "background", "thumbURL": f"{SITEURL}static/mapstorestyle/img/s2cloudless-s2cloudless.png", "visibility": False diff --git a/geonode/thumbs/tests/fixtures/map_dataset.json b/geonode/thumbs/tests/fixtures/map_dataset.json index e903f724b4e..cf6c7b06a3c 100644 --- a/geonode/thumbs/tests/fixtures/map_dataset.json +++ b/geonode/thumbs/tests/fixtures/map_dataset.json @@ -34,7 +34,7 @@ "map":1002, "name":"s2cloudless:s2cloudless", "store":null, - "ows_url":"https://maps.geo-solutions.it/geoserver/wms", + "ows_url":"https://maps.geosolutionsgroup.com/geoserver/wms", "extra_params":{ "msId":"s2cloudless" }, @@ -105,7 +105,7 @@ "map":1009, "name":"s2cloudless:s2cloudless", "store":null, - "ows_url":"https://maps.geo-solutions.it/geoserver/wms", + "ows_url":"https://maps.geosolutionsgroup.com/geoserver/wms", "extra_params":{ "msId":"s2cloudless" }, diff --git a/geonode/thumbs/tests/test_unit.py b/geonode/thumbs/tests/test_unit.py index 68ed3cb462c..cbe50a39f2d 100644 --- a/geonode/thumbs/tests/test_unit.py +++ b/geonode/thumbs/tests/test_unit.py @@ -221,7 +221,7 @@ def test_datasets_locations_simple_map(self): map=map, name="Meteorite_Landings_from_NASA_Open_Data_Portal1", current_style="test_style", - ows_url="https://maps.geo-solutions.it/geoserver/wms", + ows_url="https://maps.geosolutionsgroup.com/geoserver/wms", ).save() locations, bbox = thumbnails._datasets_locations(map) diff --git a/package/debian/changelog b/package/debian/changelog index 4fa45b1b116..14ee1aaee98 100644 --- a/package/debian/changelog +++ b/package/debian/changelog @@ -694,13 +694,13 @@ geonode (2.10.0+rc4) bionic; urgency=high * [07549481d] 2018-01-16 - (Alessio Fabiani ) [Fixes #3568] - Fix, improve and adapt Backup/Restore Scripts to GeoNode 2.6+ (#3571) * [da4b12b92] 2018-01-15 - (Ricardo Garcia ..) added support for KML and KMZ with GroundOverlay - -- Alessio Fabiani Tue, 21 Aug 2018 16:47:18 +0200 + -- Alessio Fabiani Tue, 21 Aug 2018 16:47:18 +0200 geonode (2.8.0+thefinal1) xenial; urgency=high * [514196] Update README * [f6dd15] Constrain pip to 9.0.3 - -- Alessio Fabiani Thu, 26 Apr 2018 12:44:14 +0200 + -- Alessio Fabiani Thu, 26 Apr 2018 12:44:14 +0200 geonode (2.8.0+thefinal0) xenial; urgency=high [ afabiani ] @@ -729,7 +729,7 @@ geonode (2.8.0+thefinal0) xenial; urgency=high [ Alessio Fabiani ] * [48eea1] Release 2.8.0 - -- Alessio Fabiani Tue, 03 Apr 2018 10:40:23 +0200 + -- Alessio Fabiani Tue, 03 Apr 2018 10:40:23 +0200 geonode (2.8.0+rc12) xenial; urgency=high [ Alessio Fabiani ] @@ -785,31 +785,31 @@ geonode (2.8.0+rc12) xenial; urgency=high [ Alessio Fabiani ] - -- Alessio Fabiani Fri, 30 Mar 2018 11:55:49 +0200 + -- Alessio Fabiani Fri, 30 Mar 2018 11:55:49 +0200 geonode (2.8.0+rc10) xenial; urgency=high * [c8abc4] GeoNode 2.7.5.dev20180123130714 - -- Alessio Fabiani Wed, 24 Jan 2018 16:41:05 +0100 + -- Alessio Fabiani Wed, 24 Jan 2018 16:41:05 +0100 geonode (2.7.5+dev20180123112419) xenial; urgency=high * [dd4a19] [Fixes #3568] - Fix, improve and adapt Backup/Restore Scripts to GeoNode 2.6+ (#3571) * [c8bd21] [Fixes #3565 #3566] Topic Category is no more visible on the Layer summary list / If a Resource belongs to a Group, it should be also visible on the summary list - -- Alessio Fabiani Tue, 23 Jan 2018 14:06:12 +0100 + -- Alessio Fabiani Tue, 23 Jan 2018 14:06:12 +0100 geonode (2.8.0+rc9) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Mon, 22 Jan 2018 17:00:01 +0100 + -- Alessio Fabiani Mon, 22 Jan 2018 17:00:01 +0100 geonode (2.8.0+rc8) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Mon, 22 Jan 2018 16:07:49 +0100 + -- Alessio Fabiani Mon, 22 Jan 2018 16:07:49 +0100 geonode (2.8.0+rc7) xenial; urgency=high @@ -817,25 +817,25 @@ geonode (2.8.0+rc7) xenial; urgency=high * [f61c3a] - GeoNode 2.8rc6 * [82927b] - GeoNode 2.8 - -- Alessio Fabiani Mon, 22 Jan 2018 15:12:04 +0100 + -- Alessio Fabiani Mon, 22 Jan 2018 15:12:04 +0100 geonode (2.8.0+rc6) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Fri, 19 Jan 2018 02:42:42 +0100 + -- Alessio Fabiani Fri, 19 Jan 2018 02:42:42 +0100 geonode (2.8.0+rc5) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Fri, 19 Jan 2018 01:59:18 +0100 + -- Alessio Fabiani Fri, 19 Jan 2018 01:59:18 +0100 geonode (2.8.0+rc4) xenial; urgency=high * [b92c19] - GeoNode Releasing 2.8.0rc3 - -- Alessio Fabiani Fri, 19 Jan 2018 01:17:22 +0100 + -- Alessio Fabiani Fri, 19 Jan 2018 01:17:22 +0100 geonode (2.8.0+rc3) xenial; urgency=high @@ -845,25 +845,25 @@ geonode (2.8.0+rc3) xenial; urgency=high [ Alessio Fabiani ] * [f8b945] - GeoNode Releasing - -- Alessio Fabiani Thu, 18 Jan 2018 20:39:58 +0100 + -- Alessio Fabiani Thu, 18 Jan 2018 20:39:58 +0100 geonode (2.8.0+rc2) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Thu, 18 Jan 2018 11:34:09 +0100 + -- Alessio Fabiani Thu, 18 Jan 2018 11:34:09 +0100 geonode (2.8.0+rc1) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Wed, 17 Jan 2018 18:50:18 +0100 + -- Alessio Fabiani Wed, 17 Jan 2018 18:50:18 +0100 geonode (2.8.0+rc0) xenial; urgency=high * UNRELEASED - -- Alessio Fabiani Wed, 17 Jan 2018 18:45:44 +0100 + -- Alessio Fabiani Wed, 17 Jan 2018 18:45:44 +0100 geonode (2.8.0+rc0) xenial; urgency=high @@ -875,7 +875,7 @@ geonode (2.8.0+rc0) xenial; urgency=high * [27db87] - Fix GeoNode 2.6.3 to 2.7.x+ Migration (#3547) * [a1ed92] [2.7.x] - Prepare for 28x (#3551) - -- Alessio Fabiani Mon, 15 Jan 2018 09:56:20 +0100 + -- Alessio Fabiani Mon, 15 Jan 2018 09:56:20 +0100 geonode (2.7.4+dev20171114153121) xenial; urgency=high @@ -1479,7 +1479,7 @@ geonode (2.7.4+dev20171114153121) xenial; urgency=high [ Alessio Fabiani ] * [20f27a] Allow sending messages to multiple users and groups - -- Alessio Fabiani Tue, 14 Nov 2017 17:13:40 +0100 + -- Alessio Fabiani Tue, 14 Nov 2017 17:13:40 +0100 geonode (2.7.1+dev20171013111656) xenial; urgency=high @@ -1662,7 +1662,7 @@ geonode (2.7.1+dev20171013111656) xenial; urgency=high * [66d4b0] - Improved Thumbnail Feedbacks * [8bf09a] Merge with master - -- Alessio Fabiani Fri, 13 Oct 2017 17:14:40 +0200 + -- Alessio Fabiani Fri, 13 Oct 2017 17:14:40 +0200 geonode (2.7.0+thefinal0) xenial; urgency=high @@ -2347,7 +2347,7 @@ geonode (2.7.0+thefinal0) xenial; urgency=high * [b3f938] - Returns referencing infos on Layers Upload * [b5a775] bump to version 2.7.0 - -- Alessio Fabiani Tue, 05 Sep 2017 16:43:18 +0200 + -- Alessio Fabiani Tue, 05 Sep 2017 16:43:18 +0200 geonode (2.6.0+thefinal0) trusty; urgency=high diff --git a/package/debian/control b/package/debian/control index 1120bd2420a..62d10fd8687 100644 --- a/package/debian/control +++ b/package/debian/control @@ -1,5 +1,5 @@ Source: geonode -Maintainer: Alessio Fabiani +Maintainer: Alessio Fabiani Section: python Priority: optional Standards-Version: 3.9.1 diff --git a/package/geoserver/debian/changelog b/package/geoserver/debian/changelog index 890bc21133d..6f6f6549575 100644 --- a/package/geoserver/debian/changelog +++ b/package/geoserver/debian/changelog @@ -2,43 +2,43 @@ geoserver-geonode (2.14.0) bionic; urgency=high * Updated GeoServer 2.14.x packages on testing - -- Alessio Fabiani Mon, 03 Sep 2018 10:48:48 +0200 + -- Alessio Fabiani Mon, 03 Sep 2018 10:48:48 +0200 geoserver-geonode (2.13.2) bionic; urgency=high * Updated GeoServer 2.13.x packages on testing - -- Alessio Fabiani Mon, 20 Aug 2018 12:29:29 +0200 + -- Alessio Fabiani Mon, 20 Aug 2018 12:29:29 +0200 geoserver-geonode (2.12.2-4) xenial; urgency=high * Fixed Tomcat 8 dependencies on Catalina properties - -- Alessio Fabiani Fri, 30 Mar 2018 15:50:42 +0200 + -- Alessio Fabiani Fri, 30 Mar 2018 15:50:42 +0200 geoserver-geonode (2.12.2-3) xenial; urgency=high * Updated GeoServer 2.12.x packages on testing - -- Alessio Fabiani Fri, 30 Mar 2018 15:07:42 +0200 + -- Alessio Fabiani Fri, 30 Mar 2018 15:07:42 +0200 geoserver-geonode (2.12.2-2) xenial; urgency=high * Updated GeoServer 2.12.x packages on testing - -- Alessio Fabiani Fri, 30 Mar 2018 13:10:42 +0200 + -- Alessio Fabiani Fri, 30 Mar 2018 13:10:42 +0200 geoserver-geonode (2.12.1) xenial; urgency=high * Updated GeoServer 2.12.x packages on testing - -- Alessio Fabiani Mon, 15 Jan 2018 10:26:16 +0200 + -- Alessio Fabiani Mon, 15 Jan 2018 10:26:16 +0200 geoserver-geonode (2.12.0) xenial; urgency=high * Updated to GeoServer 2.12.x - -- Alessio Fabiani Mon, 15 Jan 2018 10:26:16 +0200 + -- Alessio Fabiani Mon, 15 Jan 2018 10:26:16 +0200 geoserver-geonode (2.10.0) xenial; urgency=high @@ -46,7 +46,7 @@ geoserver-geonode (2.10.0) xenial; urgency=high * Added backup and restore * Added oauth2 plugin - -- Alessio Fabiani Wed, 06 Sep 2017 12:07:41 +0200 + -- Alessio Fabiani Wed, 06 Sep 2017 12:07:41 +0200 geoserver-geonode (2.9.0) xenial; urgency=high diff --git a/package/geoserver/debian/control b/package/geoserver/debian/control index 538f642ae03..d931a11609d 100755 --- a/package/geoserver/debian/control +++ b/package/geoserver/debian/control @@ -2,7 +2,7 @@ Source: geoserver-geonode Section: science Priority: extra Build-Depends: debhelper (>= 7.0.50~), unzip -Maintainer: Alessio Fabiani +Maintainer: Alessio Fabiani Homepage: http://geonode.org Vcs-Browser: https://github.com/GeoNode/geonode Vcs-git: git://github.com/geonode/geonode.git